net: ipa: index resource limits with type

Remove the type field from the ipa_resource_src and ipa_resource_dst
structures, and instead use that value as the index into the arrays
of source and destination resources.

Change ipa_resource_config_src() and ipa_resource_config_dst() so
the resource type is passed in as an argument.

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

diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c
index e9b741832a1d7eab17fe12e28d3bf1b706f23063..eba14d7bc8ac321a8c60911a52e8b57b54278d08 100644 (file)
--- a/drivers/net/ipa/ipa_data-sc7180.c
+++ b/drivers/net/ipa/ipa_data-sc7180.c
@@ -150,36 +150,31 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
 
 /* Source resource configuration data for the SC7180 SoC */
 static const struct ipa_resource_src ipa_resource_src[] = {
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS,
+       [IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = {
                .limits[IPA_RSRC_GROUP_SRC_UL_DL] = {
                        .min = 3,
                        .max = 63,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS,
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = {
                .limits[IPA_RSRC_GROUP_SRC_UL_DL] = {
                        .min = 3,
                        .max = 3,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF,
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = {
                .limits[IPA_RSRC_GROUP_SRC_UL_DL] = {
                        .min = 10,
                        .max = 10,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_HPS_DMARS,
+       [IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = {
                .limits[IPA_RSRC_GROUP_SRC_UL_DL] = {
                        .min = 1,
                        .max = 1,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES,
+       [IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = {
                .limits[IPA_RSRC_GROUP_SRC_UL_DL] = {
                        .min = 5,
                        .max = 5,
@@ -189,15 +184,13 @@ static const struct ipa_resource_src ipa_resource_src[] = {
 
 /* Destination resource configuration data for the SC7180 SoC */
 static const struct ipa_resource_dst ipa_resource_dst[] = {
-       {
-               .type = IPA_RESOURCE_TYPE_DST_DATA_SECTORS,
+       [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = {
                .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {
                        .min = 3,
                        .max = 3,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_DST_DPS_DMARS,
+       [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = {
                .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {
                        .min = 1,
                        .max = 63,

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index 3bc5fcfdf960c918076ad3201d4ec46be575397e..4a4b3bd8a17c0379b5d715b92f6b4c3672d88ff3 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -168,8 +168,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
 
 /* Source resource configuration data for the SDM845 SoC */
 static const struct ipa_resource_src ipa_resource_src[] = {
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS,
+       [IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = {
                .limits[IPA_RSRC_GROUP_SRC_LWA_DL] = {
                        .min = 1,
                        .max = 255,
@@ -183,8 +182,7 @@ static const struct ipa_resource_src ipa_resource_src[] = {
                        .max = 63,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS,
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = {
                .limits[IPA_RSRC_GROUP_SRC_LWA_DL] = {
                        .min = 10,
                        .max = 10,
@@ -198,8 +196,7 @@ static const struct ipa_resource_src ipa_resource_src[] = {
                        .max = 8,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF,
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = {
                .limits[IPA_RSRC_GROUP_SRC_LWA_DL] = {
                        .min = 12,
                        .max = 12,
@@ -213,8 +210,7 @@ static const struct ipa_resource_src ipa_resource_src[] = {
                        .max = 8,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_HPS_DMARS,
+       [IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = {
                .limits[IPA_RSRC_GROUP_SRC_LWA_DL] = {
                        .min = 0,
                        .max = 63,
@@ -232,8 +228,7 @@ static const struct ipa_resource_src ipa_resource_src[] = {
                        .max = 63,
                },
        },
-       {
-               .type = IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES,
+       [IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = {
                .limits[IPA_RSRC_GROUP_SRC_LWA_DL] = {
                        .min = 14,
                        .max = 14,
@@ -251,8 +246,7 @@ static const struct ipa_resource_src ipa_resource_src[] = {
 
 /* Destination resource configuration data for the SDM845 SoC */
 static const struct ipa_resource_dst ipa_resource_dst[] = {
-       {
-               .type = IPA_RESOURCE_TYPE_DST_DATA_SECTORS,
+       [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = {
                .limits[IPA_RSRC_GROUP_DST_LWA_DL] = {
                        .min = 4,
                        .max = 4,
@@ -266,8 +260,7 @@ static const struct ipa_resource_dst ipa_resource_dst[] = {
                        .max = 3,
                }
        },
-       {
-               .type = IPA_RESOURCE_TYPE_DST_DPS_DMARS,
+       [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = {
                .limits[IPA_RSRC_GROUP_DST_LWA_DL] = {
                        .min = 2,
                        .max = 63,

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index ccd7fd0b801aae3258b336514240f88fe72a9dca..44b93f93ee6083ba79fe3b47388e631cbc35a2ab 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -220,21 +220,17 @@ struct ipa_resource_limits {
 
 /**
  * struct ipa_resource_src - source endpoint group resource usage
- * @type:      source group resource type
  * @limits:    array of limits to use for each resource group
  */
 struct ipa_resource_src {
-       enum ipa_resource_type type;    /* IPA_RESOURCE_TYPE_SRC_* */
        struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_SRC_MAX];
 };
 
 /**
  * struct ipa_resource_dst - destination endpoint group resource usage
- * @type:      destination group resource type
  * @limits:    array of limits to use for each resource group
  */
 struct ipa_resource_dst {
-       enum ipa_resource_type type;    /* IPA_RESOURCE_TYPE_DST_* */
        struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_DST_MAX];
 };
 

diff --git a/drivers/net/ipa/ipa_resource.c b/drivers/net/ipa/ipa_resource.c
index edd9d1e5cbb6271099b1c44e804660e079acd450..506bcccaef64f5af504a7031c103df07713eb19e 100644 (file)
--- a/drivers/net/ipa/ipa_resource.c
+++ b/drivers/net/ipa/ipa_resource.c
@@ -128,54 +128,54 @@ ipa_resource_config_common(struct ipa *ipa, u32 offset,
        iowrite32(val, ipa->reg_virt + offset);
 }
 
-static void ipa_resource_config_src(struct ipa *ipa,
+static void ipa_resource_config_src(struct ipa *ipa, u32 resource_type,
                                    const struct ipa_resource_src *resource)
 {
        u32 group_count = ipa_resource_group_src_count(ipa->version);
        const struct ipa_resource_limits *ylimits;
        u32 offset;
 
-       offset = IPA_REG_SRC_RSRC_GRP_01_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_SRC_RSRC_GRP_01_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 1 ? NULL : &resource->limits[1];
        ipa_resource_config_common(ipa, offset, &resource->limits[0], ylimits);
 
        if (group_count < 3)
                return;
 
-       offset = IPA_REG_SRC_RSRC_GRP_23_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_SRC_RSRC_GRP_23_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 3 ? NULL : &resource->limits[3];
        ipa_resource_config_common(ipa, offset, &resource->limits[2], ylimits);
 
        if (group_count < 5)
                return;
 
-       offset = IPA_REG_SRC_RSRC_GRP_45_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_SRC_RSRC_GRP_45_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 5 ? NULL : &resource->limits[5];
        ipa_resource_config_common(ipa, offset, &resource->limits[4], ylimits);
 }
 
-static void ipa_resource_config_dst(struct ipa *ipa,
+static void ipa_resource_config_dst(struct ipa *ipa, u32 resource_type,
                                    const struct ipa_resource_dst *resource)
 {
        u32 group_count = ipa_resource_group_dst_count(ipa->version);
        const struct ipa_resource_limits *ylimits;
        u32 offset;
 
-       offset = IPA_REG_DST_RSRC_GRP_01_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_DST_RSRC_GRP_01_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 1 ? NULL : &resource->limits[1];
        ipa_resource_config_common(ipa, offset, &resource->limits[0], ylimits);
 
        if (group_count < 3)
                return;
 
-       offset = IPA_REG_DST_RSRC_GRP_23_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_DST_RSRC_GRP_23_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 3 ? NULL : &resource->limits[3];
        ipa_resource_config_common(ipa, offset, &resource->limits[2], ylimits);
 
        if (group_count < 5)
                return;
 
-       offset = IPA_REG_DST_RSRC_GRP_45_RSRC_TYPE_N_OFFSET(resource->type);
+       offset = IPA_REG_DST_RSRC_GRP_45_RSRC_TYPE_N_OFFSET(resource_type);
        ylimits = group_count == 5 ? NULL : &resource->limits[5];
        ipa_resource_config_common(ipa, offset, &resource->limits[4], ylimits);
 }
@@ -189,10 +189,10 @@ int ipa_resource_config(struct ipa *ipa, const struct ipa_resource_data *data)
                return -EINVAL;
 
        for (i = 0; i < data->resource_src_count; i++)
-               ipa_resource_config_src(ipa, &data->resource_src[i]);
+               ipa_resource_config_src(ipa, i, &data->resource_src[i]);
 
        for (i = 0; i < data->resource_dst_count; i++)
-               ipa_resource_config_dst(ipa, &data->resource_dst[i]);
+               ipa_resource_config_dst(ipa, i, &data->resource_dst[i]);
 
        return 0;
 }