net: ipa: use ipa_table_mem() in ipa_table_reset_add()

Similar to the previous commit, pass flags rather than a memory
region ID to ipa_table_reset_add(), and there use ipa_table_mem() to
look up the memory region affected based on those flags.

Currently all eight of these table memory regions are assumed to
exist, because they all have canaries within them.  Stop assuming
that will always be the case, and in ipa_table_reset_add() allow
these memory regions to be non-existent.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c
index 94bb7611e574ba4b3d8f9317213788ec943da73e..3a14465bf8a6420d009d3a7a27319b827d0ebd07 100644 (file)
--- a/drivers/net/ipa/ipa_table.c
+++ b/drivers/net/ipa/ipa_table.c
@@ -200,16 +200,17 @@ static dma_addr_t ipa_table_addr(struct ipa *ipa, bool filter_mask, u16 count)
 }
 
 static void ipa_table_reset_add(struct gsi_trans *trans, bool filter,
-                               u16 first, u16 count, enum ipa_mem_id mem_id)
+                               bool hashed, bool ipv6, u16 first, u16 count)
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
-       const struct ipa_mem *mem = ipa_mem_find(ipa, mem_id);
+       const struct ipa_mem *mem;
        dma_addr_t addr;
        u32 offset;
        u16 size;
 
-       /* Nothing to do if the table memory region is empty */
-       if (!mem->size)
+       /* Nothing to do if the memory region is doesn't exist or is empty */
+       mem = ipa_table_mem(ipa, filter, hashed, ipv6);
+       if (!mem || !mem->size)
                return;
 
        if (filter)
@@ -227,7 +228,7 @@ static void ipa_table_reset_add(struct gsi_trans *trans, bool filter,
  * for the IPv4 and IPv6 non-hashed and hashed filter tables.
  */
 static int
-ipa_filter_reset_table(struct ipa *ipa, enum ipa_mem_id mem_id, bool modem)
+ipa_filter_reset_table(struct ipa *ipa, bool hashed, bool ipv6, bool modem)
 {
        u32 ep_mask = ipa->filter_map;
        u32 count = hweight32(ep_mask);
@@ -253,7 +254,7 @@ ipa_filter_reset_table(struct ipa *ipa, enum ipa_mem_id mem_id, bool modem)
                if (endpoint->ee_id != ee_id)
                        continue;
 
-               ipa_table_reset_add(trans, true, endpoint_id, 1, mem_id);
+               ipa_table_reset_add(trans, true, hashed, ipv6, endpoint_id, 1);
        }
 
        gsi_trans_commit_wait(trans);
@@ -269,18 +270,18 @@ static int ipa_filter_reset(struct ipa *ipa, bool modem)
 {
        int ret;
 
-       ret = ipa_filter_reset_table(ipa, IPA_MEM_V4_FILTER, modem);
+       ret = ipa_filter_reset_table(ipa, false, false, modem);
        if (ret)
                return ret;
 
-       ret = ipa_filter_reset_table(ipa, IPA_MEM_V4_FILTER_HASHED, modem);
+       ret = ipa_filter_reset_table(ipa, true, false, modem);
        if (ret)
                return ret;
 
-       ret = ipa_filter_reset_table(ipa, IPA_MEM_V6_FILTER, modem);
+       ret = ipa_filter_reset_table(ipa, false, true, modem);
        if (ret)
                return ret;
-       ret = ipa_filter_reset_table(ipa, IPA_MEM_V6_FILTER_HASHED, modem);
+       ret = ipa_filter_reset_table(ipa, true, true, modem);
 
        return ret;
 }
@@ -312,13 +313,11 @@ static int ipa_route_reset(struct ipa *ipa, bool modem)
                count = ipa->route_count - modem_route_count;
        }
 
-       ipa_table_reset_add(trans, false, first, count, IPA_MEM_V4_ROUTE);
-       ipa_table_reset_add(trans, false, first, count,
-                           IPA_MEM_V4_ROUTE_HASHED);
+       ipa_table_reset_add(trans, false, false, false, first, count);
+       ipa_table_reset_add(trans, false, true, false, first, count);
 
-       ipa_table_reset_add(trans, false, first, count, IPA_MEM_V6_ROUTE);
-       ipa_table_reset_add(trans, false, first, count,
-                           IPA_MEM_V6_ROUTE_HASHED);
+       ipa_table_reset_add(trans, false, false, true, first, count);
+       ipa_table_reset_add(trans, false, true, true, first, count);
 
        gsi_trans_commit_wait(trans);