leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ipa: redefine struct ipa_mem_data

Browse Source 
The ipa_mem_data structure type was never actually used.  Instead,
the IPA memory regions were defined using the ipa_mem structure.

Redefine struct ipa_mem_data so it encapsulates the array of IPA-local
memory region descriptors along with the count of entries in that
array.  Pass just an ipa_mem structure pointer to ipa_mem_init().

Rename the ipa_mem_data[] array ipa_mem_local_data[] to emphasize
that the memory regions it defines are IPA-local memory.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alex Elder 2020-05-04 12:58:57 -05:00 committed by David S. Miller
parent 8456c54408
commit 3128aae8c4
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ipa/ipa_data-sc7180.c
View File

@ -193,7 +193,7 @@ static const struct ipa_resource_data ipa_resource_data = {
}; };
/* IPA-resident memory region configuration for the SC7180 SoC. */ /* IPA-resident memory region configuration for the SC7180 SoC. */
static const struct ipa_mem ipa_mem_data[] = { static const struct ipa_mem ipa_mem_local_data[] = {
[IPA_MEM_UC_SHARED] = { [IPA_MEM_UC_SHARED] = {
.offset = 0x0000, .offset = 0x0000,
.size = 0x0080, .size = 0x0080,
@ -296,12 +296,16 @@ static const struct ipa_mem ipa_mem_data[] = {
}, },
}; };
static struct ipa_mem_data ipa_mem_data = {
.local_count = ARRAY_SIZE(ipa_mem_local_data),
.local = ipa_mem_local_data,
};
/* Configuration data for the SC7180 SoC. */ /* Configuration data for the SC7180 SoC. */
const struct ipa_data ipa_data_sc7180 = { const struct ipa_data ipa_data_sc7180 = {
.version = IPA_VERSION_4_2, .version = IPA_VERSION_4_2,
.endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data),
.endpoint_data = ipa_gsi_endpoint_data, .endpoint_data = ipa_gsi_endpoint_data,
.resource_data = &ipa_resource_data, .resource_data = &ipa_resource_data,
.mem_count = ARRAY_SIZE(ipa_mem_data), .mem_data = &ipa_mem_data,
.mem_data = ipa_mem_data,
}; };

10
drivers/net/ipa/ipa_data-sdm845.c
View File

@ -235,7 +235,7 @@ static const struct ipa_resource_data ipa_resource_data = {
}; };
/* IPA-resident memory region configuration for the SDM845 SoC. */ /* IPA-resident memory region configuration for the SDM845 SoC. */
static const struct ipa_mem ipa_mem_data[] = { static const struct ipa_mem ipa_mem_local_data[] = {
[IPA_MEM_UC_SHARED] = { [IPA_MEM_UC_SHARED] = {
.offset = 0x0000, .offset = 0x0000,
.size = 0x0080, .size = 0x0080,
@ -318,12 +318,16 @@ static const struct ipa_mem ipa_mem_data[] = {
}, },
}; };
static struct ipa_mem_data ipa_mem_data = {
.local_count = ARRAY_SIZE(ipa_mem_local_data),
.local = ipa_mem_local_data,
};
/* Configuration data for the SDM845 SoC. */ /* Configuration data for the SDM845 SoC. */
const struct ipa_data ipa_data_sdm845 = { const struct ipa_data ipa_data_sdm845 = {
.version = IPA_VERSION_3_5_1, .version = IPA_VERSION_3_5_1,
.endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data),
.endpoint_data = ipa_gsi_endpoint_data, .endpoint_data = ipa_gsi_endpoint_data,
.resource_data = &ipa_resource_data, .resource_data = &ipa_resource_data,
.mem_count = ARRAY_SIZE(ipa_mem_data), .mem_data = &ipa_mem_data,
.mem_data = ipa_mem_data,
}; };

13
drivers/net/ipa/ipa_data.h
View File

@ -246,14 +246,12 @@ struct ipa_resource_data {
/** /**
* struct ipa_mem - IPA-local memory region description * struct ipa_mem - IPA-local memory region description
* @offset: offset in IPA memory space to base of the region * @local_count: number of regions defined in the local[] array
* @size: size in bytes base of the region * @local: array of IPA-local memory region descriptors
* @canary_count: number of 32-bit "canary" values that precede region
*/ */
struct ipa_mem_data { struct ipa_mem_data {
u32 offset; u32 local_count;
u16 size; const struct ipa_mem *local;
u16 canary_count;
}; };
/** /**
@ -270,8 +268,7 @@ struct ipa_data {
u32 endpoint_count; /* # entries in endpoint_data[] */ u32 endpoint_count; /* # entries in endpoint_data[] */
const struct ipa_gsi_endpoint_data *endpoint_data; const struct ipa_gsi_endpoint_data *endpoint_data;
const struct ipa_resource_data *resource_data; const struct ipa_resource_data *resource_data;
u32 mem_count; /* # entries in mem_data[] */ const struct ipa_mem_data *mem_data;
const struct ipa_mem *mem_data;
}; };
extern const struct ipa_data ipa_data_sdm845; extern const struct ipa_data ipa_data_sdm845;

2
drivers/net/ipa/ipa_main.c
View File

@ -778,7 +778,7 @@ static int ipa_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_kfree_ipa; goto err_kfree_ipa;
ret = ipa_mem_init(ipa, data->mem_count, data->mem_data); ret = ipa_mem_init(ipa, data->mem_data);
if (ret) if (ret)
goto err_reg_exit; goto err_reg_exit;

9
drivers/net/ipa/ipa_mem.c
View File

@ -12,6 +12,7 @@
#include "ipa.h" #include "ipa.h"
#include "ipa_reg.h" #include "ipa_reg.h"
#include "ipa_data.h"
#include "ipa_cmd.h" #include "ipa_cmd.h"
#include "ipa_mem.h" #include "ipa_mem.h"
#include "ipa_data.h" #include "ipa_data.h"
@ -266,15 +267,15 @@ int ipa_mem_zero_modem(struct ipa *ipa)
} }
/* Perform memory region-related initialization */ /* Perform memory region-related initialization */
int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem) int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data)
{ {
struct device *dev = &ipa->pdev->dev; struct device *dev = &ipa->pdev->dev;
struct resource *res; struct resource *res;
int ret; int ret;
if (count > IPA_MEM_COUNT) { if (mem_data->local_count > IPA_MEM_COUNT) {
dev_err(dev, "to many memory regions (%u > %u)\n", dev_err(dev, "to many memory regions (%u > %u)\n",
count, IPA_MEM_COUNT); mem_data->local_count, IPA_MEM_COUNT);
return -EINVAL; return -EINVAL;
} }
@ -302,7 +303,7 @@ int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem)
ipa->mem_size = resource_size(res); ipa->mem_size = resource_size(res);
/* The ipa->mem[] array is indexed by enum ipa_mem_id values */ /* The ipa->mem[] array is indexed by enum ipa_mem_id values */
ipa->mem = mem; ipa->mem = mem_data->local;
return 0; return 0;
} }

3
drivers/net/ipa/ipa_mem.h
View File

@ -7,6 +7,7 @@
#define _IPA_MEM_H_ #define _IPA_MEM_H_
struct ipa; struct ipa;
struct ipa_mem_data;
/** /**
* DOC: IPA Local Memory * DOC: IPA Local Memory
@ -84,7 +85,7 @@ void ipa_mem_teardown(struct ipa *ipa);
int ipa_mem_zero_modem(struct ipa *ipa); int ipa_mem_zero_modem(struct ipa *ipa);
int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem); int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data);
void ipa_mem_exit(struct ipa *ipa); void ipa_mem_exit(struct ipa *ipa);
#endif /* _IPA_MEM_H_ */ #endif /* _IPA_MEM_H_ */