net: ipa: distinguish between resource group types

The number of resource groups supported by the hardware can be
different for source and destination resources.  Determine the
number supported for each using separate functions.  Make the
functions inline end move their definitions into "ipa_reg.h",
because they determine whether certain register definitions are
valid.  Pass just the IPA hardware version as argument.

IPA_RESOURCE_GROUP_COUNT represents the maximum number of resource
groups the driver supports for any hardware version.  Change that
symbol to be two separate constants, one for source and the other
for destination resource groups.  Rename them to end with "_MAX"
rather than "_COUNT", to reflect their true purpose.

Tested-by: Sujit Kautkar <sujitka@chromium.org>
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index d084a83069db2a2be318281264c67818b5f97a19..0225d81d85028d7a12fba79a35beeeedac89d135 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -45,10 +45,10 @@
  * the IPA endpoint.
  */
 
-/* The maximum value returned by ipa_resource_group_count() */
-#define IPA_RESOURCE_GROUP_COUNT       4
+/* The maximum value returned by ipa_resource_group_{src,dst}_count() */
+#define IPA_RESOURCE_GROUP_SRC_MAX     4
+#define IPA_RESOURCE_GROUP_DST_MAX     4
 
-/** enum ipa_resource_type_src - source resource types */
 /**
  * struct gsi_channel_data - GSI channel configuration data
  * @tre_count:         number of TREs in the channel ring
@@ -208,7 +208,7 @@ struct ipa_resource_limits {
  */
 struct ipa_resource_src {
        enum ipa_resource_type_src type;
-       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_COUNT];
+       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_SRC_MAX];
 };
 
 /**
@@ -218,7 +218,7 @@ struct ipa_resource_src {
  */
 struct ipa_resource_dst {
        enum ipa_resource_type_dst type;
-       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_COUNT];
+       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_DST_MAX];
 };
 
 /**

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index cd4d993b0bbb255cb6434648caa6a041ade9e3f3..74b1e15ebd6b22ff5b1ddb729bd595c9c8343219 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -363,52 +363,38 @@ static void ipa_hardware_deconfig(struct ipa *ipa)
 
 #ifdef IPA_VALIDATION
 
-/* # IPA resources used based on version (see IPA_RESOURCE_GROUP_COUNT) */
-static int ipa_resource_group_count(struct ipa *ipa)
-{
-       switch (ipa->version) {
-       case IPA_VERSION_3_5_1:
-               return 3;
-
-       case IPA_VERSION_4_0:
-       case IPA_VERSION_4_1:
-               return 4;
-
-       case IPA_VERSION_4_2:
-               return 1;
-
-       default:
-               return 0;
-       }
-}
-
 static bool ipa_resource_limits_valid(struct ipa *ipa,
                                      const struct ipa_resource_data *data)
 {
-       u32 group_count = ipa_resource_group_count(ipa);
+       u32 group_count;
        u32 i;
        u32 j;
 
+       group_count = ipa_resource_group_src_count(ipa->version);
        if (!group_count)
                return false;
 
-       /* Return an error if a non-zero resource group limit is specified
-        * for a resource not supported by hardware.
+       /* Return an error if a non-zero resource limit is specified
+        * for a resource group not supported by hardware.
         */
        for (i = 0; i < data->resource_src_count; i++) {
                const struct ipa_resource_src *resource;
 
                resource = &data->resource_src[i];
-               for (j = group_count; j < IPA_RESOURCE_GROUP_COUNT; j++)
+               for (j = group_count; j < IPA_RESOURCE_GROUP_SRC_MAX; j++)
                        if (resource->limits[j].min || resource->limits[j].max)
                                return false;
        }
 
+       group_count = ipa_resource_group_dst_count(ipa->version);
+       if (!group_count)
+               return false;
+
        for (i = 0; i < data->resource_dst_count; i++) {
                const struct ipa_resource_dst *resource;
 
                resource = &data->resource_dst[i];
-               for (j = group_count; j < IPA_RESOURCE_GROUP_COUNT; j++)
+               for (j = group_count; j < IPA_RESOURCE_GROUP_DST_MAX; j++)
                        if (resource->limits[j].min || resource->limits[j].max)
                                return false;
        }

diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h
index 7dcfa07180f9f16ef86966e71da0b1813f683a0d..8eaf5f20962708a3156852f7fc472dfbef616612 100644 (file)
--- a/drivers/net/ipa/ipa_reg.h
+++ b/drivers/net/ipa/ipa_reg.h
@@ -244,6 +244,43 @@ static inline u32 ipa_reg_idle_indication_cfg_offset(enum ipa_version version)
 #define ENTER_IDLE_DEBOUNCE_THRESH_FMASK       GENMASK(15, 0)
 #define CONST_NON_IDLE_ENABLE_FMASK            GENMASK(16, 16)
 
+/* # IPA source resource groups available based on version */
+static inline u32 ipa_resource_group_src_count(enum ipa_version version)
+{
+       switch (version) {
+       case IPA_VERSION_3_5_1:
+       case IPA_VERSION_4_0:
+       case IPA_VERSION_4_1:
+               return 4;
+
+       case IPA_VERSION_4_2:
+               return 1;
+
+       default:
+               return 0;
+       }
+}
+
+/* # IPA destination resource groups available based on version */
+static inline u32 ipa_resource_group_dst_count(enum ipa_version version)
+{
+       switch (version) {
+       case IPA_VERSION_3_5_1:
+               return 3;
+
+       case IPA_VERSION_4_0:
+       case IPA_VERSION_4_1:
+               return 4;
+
+       case IPA_VERSION_4_2:
+               return 1;
+
+       default:
+               return 0;
+       }
+}
+
+/* Not all of the following are valid (depends on the count, above) */
 #define IPA_REG_SRC_RSRC_GRP_01_RSRC_TYPE_N_OFFSET(rt) \
                                        (0x00000400 + 0x0020 * (rt))
 #define IPA_REG_SRC_RSRC_GRP_23_RSRC_TYPE_N_OFFSET(rt) \