Commit 2f187bfa authored by Colin Foster's avatar Colin Foster Committed by David S. Miller
Browse files

net: ethernet: ocelot: remove the need for num_stats initializer 



There is a desire to share the oclot_stats_layout struct outside of the
current vsc7514 driver. In order to do so, the length of the array needs to
be known at compile time, and defined in the struct ocelot and struct
felix_info.

Since the array is defined in a .c file and would be declared in the header
file via:
extern struct ocelot_stat_layout[];
the size of the array will not be known at compile time to outside modules.

To fix this, remove the need for defining the number of stats at compile
time and allow this number to be determined at initialization.

Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 783d108d

drivers/net/dsa/ocelot/felix.c

+0 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,6 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) 


	ocelot->map		= felix->info->map;

	ocelot->stats_layout	= felix->info->stats_layout;

	ocelot->num_stats	= felix->info->num_stats;

	ocelot->num_mact_rows	= felix->info->num_mact_rows;

	ocelot->vcap		= felix->info->vcap;

	ocelot->vcap_pol.base	= felix->info->vcap_pol_base;

drivers/net/dsa/ocelot/felix.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ struct felix_info { 
	const u32			*port_modes;

	int				num_mact_rows;

	const struct ocelot_stat_layout	*stats_layout;

	unsigned int			num_stats;

	int				num_ports;

	int				num_tx_queues;

	struct vcap_props		*vcap;

drivers/net/dsa/ocelot/felix_vsc9959.c

+1 −1
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ static const struct ocelot_stat_layout vsc9959_stats_layout[] = { 
	{ .offset = 0x10F,	.name = "drop_green_prio_5", },

	{ .offset = 0x110,	.name = "drop_green_prio_6", },

	{ .offset = 0x111,	.name = "drop_green_prio_7", },

	OCELOT_STAT_END

};



static const struct vcap_field vsc9959_vcap_es0_keys[] = {
@@ -2216,7 +2217,6 @@ static const struct felix_info felix_info_vsc9959 = { 
	.map			= vsc9959_regmap,

	.ops			= &vsc9959_ops,

	.stats_layout		= vsc9959_stats_layout,

	.num_stats		= ARRAY_SIZE(vsc9959_stats_layout),

	.vcap			= vsc9959_vcap_props,

	.vcap_pol_base		= VSC9959_VCAP_POLICER_BASE,

	.vcap_pol_max		= VSC9959_VCAP_POLICER_MAX,

drivers/net/dsa/ocelot/seville_vsc9953.c

+1 −1
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ static const struct ocelot_stat_layout vsc9953_stats_layout[] = { 
	{ .offset = 0x8F,	.name = "drop_green_prio_5", },

	{ .offset = 0x90,	.name = "drop_green_prio_6", },

	{ .offset = 0x91,	.name = "drop_green_prio_7", },

	OCELOT_STAT_END

};



static const struct vcap_field vsc9953_vcap_es0_keys[] = {
@@ -1086,7 +1087,6 @@ static const struct felix_info seville_info_vsc9953 = { 
	.map			= vsc9953_regmap,

	.ops			= &vsc9953_ops,

	.stats_layout		= vsc9953_stats_layout,

	.num_stats		= ARRAY_SIZE(vsc9953_stats_layout),

	.vcap			= vsc9953_vcap_props,

	.vcap_pol_base		= VSC9953_VCAP_POLICER_BASE,

	.vcap_pol_max		= VSC9953_VCAP_POLICER_MAX,

drivers/net/ethernet/mscc/ocelot.c

+5 −0
Original line number Diff line number Diff line
@@ -3228,6 +3228,7 @@ static void ocelot_detect_features(struct ocelot *ocelot) 


int ocelot_init(struct ocelot *ocelot)

{

	const struct ocelot_stat_layout *stat;

	char queue_name[32];

	int i, ret;

	u32 port;
@@ -3240,6 +3241,10 @@ int ocelot_init(struct ocelot *ocelot) 
		}

	}



	ocelot->num_stats = 0;

	for_each_stat(ocelot, stat)

		ocelot->num_stats++;



	ocelot->stats = devm_kcalloc(ocelot->dev,

				     ocelot->num_phys_ports * ocelot->num_stats,

				     sizeof(u64), GFP_KERNEL);