Commit 3128aae8 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: redefine struct ipa_mem_data 



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: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8456c544

drivers/net/ipa/ipa_data-sc7180.c

+7 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static const struct ipa_resource_data ipa_resource_data = { 
};



/* 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] = {

		.offset		= 0x0000,

		.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. */

const struct ipa_data ipa_data_sc7180 = {

	.version	= IPA_VERSION_4_2,

	.endpoint_count	= ARRAY_SIZE(ipa_gsi_endpoint_data),

	.endpoint_data	= ipa_gsi_endpoint_data,

	.resource_data	= &ipa_resource_data,

	.mem_count	= ARRAY_SIZE(ipa_mem_data),

	.mem_data	= ipa_mem_data,

	.mem_data	= &ipa_mem_data,

};

drivers/net/ipa/ipa_data-sdm845.c

+7 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static const struct ipa_resource_data ipa_resource_data = { 
};



/* 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] = {

		.offset		= 0x0000,

		.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. */

const struct ipa_data ipa_data_sdm845 = {

	.version	= IPA_VERSION_3_5_1,

	.endpoint_count	= ARRAY_SIZE(ipa_gsi_endpoint_data),

	.endpoint_data	= ipa_gsi_endpoint_data,

	.resource_data	= &ipa_resource_data,

	.mem_count	= ARRAY_SIZE(ipa_mem_data),

	.mem_data	= ipa_mem_data,

	.mem_data	= &ipa_mem_data,

};

drivers/net/ipa/ipa_data.h

+5 −8
Original line number Diff line number Diff line
@@ -246,14 +246,12 @@ struct ipa_resource_data { 


/**

 * struct ipa_mem - IPA-local memory region description

 * @offset:		offset in IPA memory space to base of the region

 * @size:		size in bytes base of the region

 * @canary_count:	number of 32-bit "canary" values that precede region

 * @local_count:	number of regions defined in the local[] array

 * @local:		array of IPA-local memory region descriptors

 */

struct ipa_mem_data {

	u32 offset;

	u16 size;

	u16 canary_count;

	u32 local_count;

	const struct ipa_mem *local;

};



/**
@@ -270,8 +268,7 @@ struct ipa_data { 
	u32 endpoint_count;	/* # entries in endpoint_data[] */

	const struct ipa_gsi_endpoint_data *endpoint_data;

	const struct ipa_resource_data *resource_data;

	u32 mem_count;		/* # entries in mem_data[] */

	const struct ipa_mem *mem_data;

	const struct ipa_mem_data *mem_data;

};



extern const struct ipa_data ipa_data_sdm845;

drivers/net/ipa/ipa_main.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static int ipa_probe(struct platform_device *pdev) 
	if (ret)

		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)

		goto err_reg_exit;

drivers/net/ipa/ipa_mem.c

+5 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "ipa.h"

#include "ipa_reg.h"

#include "ipa_data.h"

#include "ipa_cmd.h"

#include "ipa_mem.h"

#include "ipa_data.h"
@@ -266,15 +267,15 @@ int ipa_mem_zero_modem(struct ipa *ipa) 
}



/* 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 resource *res;

	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",

			count, IPA_MEM_COUNT);

			mem_data->local_count, IPA_MEM_COUNT);

		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);



	/* The ipa->mem[] array is indexed by enum ipa_mem_id values */

	ipa->mem = mem;

	ipa->mem = mem_data->local;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE