Commit 91904600 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: mscc: ocelot: make struct ocelot_stat_layout array indexable 



The ocelot counters are 32-bit and require periodic reading, every 2
seconds, by ocelot_port_update_stats(), so that wraparounds are
detected.

Currently, the counters reported by ocelot_get_stats64() come from the
32-bit hardware counters directly, rather than from the 64-bit
accumulated ocelot->stats, and this is a problem for their integrity.

The strategy is to make ocelot_get_stats64() able to cherry-pick
individual stats from ocelot->stats the way in which it currently reads
them out from SYS_COUNT_* registers. But currently it can't, because
ocelot->stats is an opaque u64 array that's used only to feed data into
ethtool -S.

To solve that problem, we need to make ocelot->stats indexable, and
associate each element with an element of struct ocelot_stat_layout used
by ethtool -S.

This makes ocelot_stat_layout a fat (and possibly sparse) array, so we
need to change the way in which we access it. We no longer need
OCELOT_STAT_END as a sentinel, because we know the array's size
(OCELOT_NUM_STATS). We just need to skip the array elements that were
left unpopulated for the switch revision (ocelot, felix, seville).

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 18d8e67d

drivers/net/dsa/ocelot/felix_vsc9959.c

+373 −95
Original line number Diff line number Diff line
@@ -551,101 +551,379 @@ static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = { 
	[SYS_PAUSE_CFG_PAUSE_ENA] = REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 7, 4),

};



static const struct ocelot_stat_layout vsc9959_stats_layout[] = {

	{ .offset = 0x00,	.name = "rx_octets", },

	{ .offset = 0x01,	.name = "rx_unicast", },

	{ .offset = 0x02,	.name = "rx_multicast", },

	{ .offset = 0x03,	.name = "rx_broadcast", },

	{ .offset = 0x04,	.name = "rx_shorts", },

	{ .offset = 0x05,	.name = "rx_fragments", },

	{ .offset = 0x06,	.name = "rx_jabbers", },

	{ .offset = 0x07,	.name = "rx_crc_align_errs", },

	{ .offset = 0x08,	.name = "rx_sym_errs", },

	{ .offset = 0x09,	.name = "rx_frames_below_65_octets", },

	{ .offset = 0x0A,	.name = "rx_frames_65_to_127_octets", },

	{ .offset = 0x0B,	.name = "rx_frames_128_to_255_octets", },

	{ .offset = 0x0C,	.name = "rx_frames_256_to_511_octets", },

	{ .offset = 0x0D,	.name = "rx_frames_512_to_1023_octets", },

	{ .offset = 0x0E,	.name = "rx_frames_1024_to_1526_octets", },

	{ .offset = 0x0F,	.name = "rx_frames_over_1526_octets", },

	{ .offset = 0x10,	.name = "rx_pause", },

	{ .offset = 0x11,	.name = "rx_control", },

	{ .offset = 0x12,	.name = "rx_longs", },

	{ .offset = 0x13,	.name = "rx_classified_drops", },

	{ .offset = 0x14,	.name = "rx_red_prio_0", },

	{ .offset = 0x15,	.name = "rx_red_prio_1", },

	{ .offset = 0x16,	.name = "rx_red_prio_2", },

	{ .offset = 0x17,	.name = "rx_red_prio_3", },

	{ .offset = 0x18,	.name = "rx_red_prio_4", },

	{ .offset = 0x19,	.name = "rx_red_prio_5", },

	{ .offset = 0x1A,	.name = "rx_red_prio_6", },

	{ .offset = 0x1B,	.name = "rx_red_prio_7", },

	{ .offset = 0x1C,	.name = "rx_yellow_prio_0", },

	{ .offset = 0x1D,	.name = "rx_yellow_prio_1", },

	{ .offset = 0x1E,	.name = "rx_yellow_prio_2", },

	{ .offset = 0x1F,	.name = "rx_yellow_prio_3", },

	{ .offset = 0x20,	.name = "rx_yellow_prio_4", },

	{ .offset = 0x21,	.name = "rx_yellow_prio_5", },

	{ .offset = 0x22,	.name = "rx_yellow_prio_6", },

	{ .offset = 0x23,	.name = "rx_yellow_prio_7", },

	{ .offset = 0x24,	.name = "rx_green_prio_0", },

	{ .offset = 0x25,	.name = "rx_green_prio_1", },

	{ .offset = 0x26,	.name = "rx_green_prio_2", },

	{ .offset = 0x27,	.name = "rx_green_prio_3", },

	{ .offset = 0x28,	.name = "rx_green_prio_4", },

	{ .offset = 0x29,	.name = "rx_green_prio_5", },

	{ .offset = 0x2A,	.name = "rx_green_prio_6", },

	{ .offset = 0x2B,	.name = "rx_green_prio_7", },

	{ .offset = 0x80,	.name = "tx_octets", },

	{ .offset = 0x81,	.name = "tx_unicast", },

	{ .offset = 0x82,	.name = "tx_multicast", },

	{ .offset = 0x83,	.name = "tx_broadcast", },

	{ .offset = 0x84,	.name = "tx_collision", },

	{ .offset = 0x85,	.name = "tx_drops", },

	{ .offset = 0x86,	.name = "tx_pause", },

	{ .offset = 0x87,	.name = "tx_frames_below_65_octets", },

	{ .offset = 0x88,	.name = "tx_frames_65_to_127_octets", },

	{ .offset = 0x89,	.name = "tx_frames_128_255_octets", },

	{ .offset = 0x8A,	.name = "tx_frames_256_511_octets", },

	{ .offset = 0x8B,	.name = "tx_frames_512_1023_octets", },

	{ .offset = 0x8C,	.name = "tx_frames_1024_1526_octets", },

	{ .offset = 0x8D,	.name = "tx_frames_over_1526_octets", },

	{ .offset = 0x8E,	.name = "tx_yellow_prio_0", },

	{ .offset = 0x8F,	.name = "tx_yellow_prio_1", },

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

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

	{ .offset = 0x92,	.name = "tx_yellow_prio_4", },

	{ .offset = 0x93,	.name = "tx_yellow_prio_5", },

	{ .offset = 0x94,	.name = "tx_yellow_prio_6", },

	{ .offset = 0x95,	.name = "tx_yellow_prio_7", },

	{ .offset = 0x96,	.name = "tx_green_prio_0", },

	{ .offset = 0x97,	.name = "tx_green_prio_1", },

	{ .offset = 0x98,	.name = "tx_green_prio_2", },

	{ .offset = 0x99,	.name = "tx_green_prio_3", },

	{ .offset = 0x9A,	.name = "tx_green_prio_4", },

	{ .offset = 0x9B,	.name = "tx_green_prio_5", },

	{ .offset = 0x9C,	.name = "tx_green_prio_6", },

	{ .offset = 0x9D,	.name = "tx_green_prio_7", },

	{ .offset = 0x9E,	.name = "tx_aged", },

	{ .offset = 0x100,	.name = "drop_local", },

	{ .offset = 0x101,	.name = "drop_tail", },

	{ .offset = 0x102,	.name = "drop_yellow_prio_0", },

	{ .offset = 0x103,	.name = "drop_yellow_prio_1", },

	{ .offset = 0x104,	.name = "drop_yellow_prio_2", },

	{ .offset = 0x105,	.name = "drop_yellow_prio_3", },

	{ .offset = 0x106,	.name = "drop_yellow_prio_4", },

	{ .offset = 0x107,	.name = "drop_yellow_prio_5", },

	{ .offset = 0x108,	.name = "drop_yellow_prio_6", },

	{ .offset = 0x109,	.name = "drop_yellow_prio_7", },

	{ .offset = 0x10A,	.name = "drop_green_prio_0", },

	{ .offset = 0x10B,	.name = "drop_green_prio_1", },

	{ .offset = 0x10C,	.name = "drop_green_prio_2", },

	{ .offset = 0x10D,	.name = "drop_green_prio_3", },

	{ .offset = 0x10E,	.name = "drop_green_prio_4", },

	{ .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 ocelot_stat_layout vsc9959_stats_layout[OCELOT_NUM_STATS] = {

	[OCELOT_STAT_RX_OCTETS] = {

		.name = "rx_octets",

		.offset = 0x00,

	},

	[OCELOT_STAT_RX_UNICAST] = {

		.name = "rx_unicast",

		.offset = 0x01,

	},

	[OCELOT_STAT_RX_MULTICAST] = {

		.name = "rx_multicast",

		.offset = 0x02,

	},

	[OCELOT_STAT_RX_BROADCAST] = {

		.name = "rx_broadcast",

		.offset = 0x03,

	},

	[OCELOT_STAT_RX_SHORTS] = {

		.name = "rx_shorts",

		.offset = 0x04,

	},

	[OCELOT_STAT_RX_FRAGMENTS] = {

		.name = "rx_fragments",

		.offset = 0x05,

	},

	[OCELOT_STAT_RX_JABBERS] = {

		.name = "rx_jabbers",

		.offset = 0x06,

	},

	[OCELOT_STAT_RX_CRC_ALIGN_ERRS] = {

		.name = "rx_crc_align_errs",

		.offset = 0x07,

	},

	[OCELOT_STAT_RX_SYM_ERRS] = {

		.name = "rx_sym_errs",

		.offset = 0x08,

	},

	[OCELOT_STAT_RX_64] = {

		.name = "rx_frames_below_65_octets",

		.offset = 0x09,

	},

	[OCELOT_STAT_RX_65_127] = {

		.name = "rx_frames_65_to_127_octets",

		.offset = 0x0A,

	},

	[OCELOT_STAT_RX_128_255] = {

		.name = "rx_frames_128_to_255_octets",

		.offset = 0x0B,

	},

	[OCELOT_STAT_RX_256_511] = {

		.name = "rx_frames_256_to_511_octets",

		.offset = 0x0C,

	},

	[OCELOT_STAT_RX_512_1023] = {

		.name = "rx_frames_512_to_1023_octets",

		.offset = 0x0D,

	},

	[OCELOT_STAT_RX_1024_1526] = {

		.name = "rx_frames_1024_to_1526_octets",

		.offset = 0x0E,

	},

	[OCELOT_STAT_RX_1527_MAX] = {

		.name = "rx_frames_over_1526_octets",

		.offset = 0x0F,

	},

	[OCELOT_STAT_RX_PAUSE] = {

		.name = "rx_pause",

		.offset = 0x10,

	},

	[OCELOT_STAT_RX_CONTROL] = {

		.name = "rx_control",

		.offset = 0x11,

	},

	[OCELOT_STAT_RX_LONGS] = {

		.name = "rx_longs",

		.offset = 0x12,

	},

	[OCELOT_STAT_RX_CLASSIFIED_DROPS] = {

		.name = "rx_classified_drops",

		.offset = 0x13,

	},

	[OCELOT_STAT_RX_RED_PRIO_0] = {

		.name = "rx_red_prio_0",

		.offset = 0x14,

	},

	[OCELOT_STAT_RX_RED_PRIO_1] = {

		.name = "rx_red_prio_1",

		.offset = 0x15,

	},

	[OCELOT_STAT_RX_RED_PRIO_2] = {

		.name = "rx_red_prio_2",

		.offset = 0x16,

	},

	[OCELOT_STAT_RX_RED_PRIO_3] = {

		.name = "rx_red_prio_3",

		.offset = 0x17,

	},

	[OCELOT_STAT_RX_RED_PRIO_4] = {

		.name = "rx_red_prio_4",

		.offset = 0x18,

	},

	[OCELOT_STAT_RX_RED_PRIO_5] = {

		.name = "rx_red_prio_5",

		.offset = 0x19,

	},

	[OCELOT_STAT_RX_RED_PRIO_6] = {

		.name = "rx_red_prio_6",

		.offset = 0x1A,

	},

	[OCELOT_STAT_RX_RED_PRIO_7] = {

		.name = "rx_red_prio_7",

		.offset = 0x1B,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_0] = {

		.name = "rx_yellow_prio_0",

		.offset = 0x1C,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_1] = {

		.name = "rx_yellow_prio_1",

		.offset = 0x1D,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_2] = {

		.name = "rx_yellow_prio_2",

		.offset = 0x1E,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_3] = {

		.name = "rx_yellow_prio_3",

		.offset = 0x1F,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_4] = {

		.name = "rx_yellow_prio_4",

		.offset = 0x20,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_5] = {

		.name = "rx_yellow_prio_5",

		.offset = 0x21,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_6] = {

		.name = "rx_yellow_prio_6",

		.offset = 0x22,

	},

	[OCELOT_STAT_RX_YELLOW_PRIO_7] = {

		.name = "rx_yellow_prio_7",

		.offset = 0x23,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_0] = {

		.name = "rx_green_prio_0",

		.offset = 0x24,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_1] = {

		.name = "rx_green_prio_1",

		.offset = 0x25,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_2] = {

		.name = "rx_green_prio_2",

		.offset = 0x26,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_3] = {

		.name = "rx_green_prio_3",

		.offset = 0x27,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_4] = {

		.name = "rx_green_prio_4",

		.offset = 0x28,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_5] = {

		.name = "rx_green_prio_5",

		.offset = 0x29,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_6] = {

		.name = "rx_green_prio_6",

		.offset = 0x2A,

	},

	[OCELOT_STAT_RX_GREEN_PRIO_7] = {

		.name = "rx_green_prio_7",

		.offset = 0x2B,

	},

	[OCELOT_STAT_TX_OCTETS] = {

		.name = "tx_octets",

		.offset = 0x80,

	},

	[OCELOT_STAT_TX_UNICAST] = {

		.name = "tx_unicast",

		.offset = 0x81,

	},

	[OCELOT_STAT_TX_MULTICAST] = {

		.name = "tx_multicast",

		.offset = 0x82,

	},

	[OCELOT_STAT_TX_BROADCAST] = {

		.name = "tx_broadcast",

		.offset = 0x83,

	},

	[OCELOT_STAT_TX_COLLISION] = {

		.name = "tx_collision",

		.offset = 0x84,

	},

	[OCELOT_STAT_TX_DROPS] = {

		.name = "tx_drops",

		.offset = 0x85,

	},

	[OCELOT_STAT_TX_PAUSE] = {

		.name = "tx_pause",

		.offset = 0x86,

	},

	[OCELOT_STAT_TX_64] = {

		.name = "tx_frames_below_65_octets",

		.offset = 0x87,

	},

	[OCELOT_STAT_TX_65_127] = {

		.name = "tx_frames_65_to_127_octets",

		.offset = 0x88,

	},

	[OCELOT_STAT_TX_128_255] = {

		.name = "tx_frames_128_255_octets",

		.offset = 0x89,

	},

	[OCELOT_STAT_TX_256_511] = {

		.name = "tx_frames_256_511_octets",

		.offset = 0x8A,

	},

	[OCELOT_STAT_TX_512_1023] = {

		.name = "tx_frames_512_1023_octets",

		.offset = 0x8B,

	},

	[OCELOT_STAT_TX_1024_1526] = {

		.name = "tx_frames_1024_1526_octets",

		.offset = 0x8C,

	},

	[OCELOT_STAT_TX_1527_MAX] = {

		.name = "tx_frames_over_1526_octets",

		.offset = 0x8D,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_0] = {

		.name = "tx_yellow_prio_0",

		.offset = 0x8E,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_1] = {

		.name = "tx_yellow_prio_1",

		.offset = 0x8F,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_2] = {

		.name = "tx_yellow_prio_2",

		.offset = 0x90,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_3] = {

		.name = "tx_yellow_prio_3",

		.offset = 0x91,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_4] = {

		.name = "tx_yellow_prio_4",

		.offset = 0x92,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_5] = {

		.name = "tx_yellow_prio_5",

		.offset = 0x93,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_6] = {

		.name = "tx_yellow_prio_6",

		.offset = 0x94,

	},

	[OCELOT_STAT_TX_YELLOW_PRIO_7] = {

		.name = "tx_yellow_prio_7",

		.offset = 0x95,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_0] = {

		.name = "tx_green_prio_0",

		.offset = 0x96,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_1] = {

		.name = "tx_green_prio_1",

		.offset = 0x97,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_2] = {

		.name = "tx_green_prio_2",

		.offset = 0x98,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_3] = {

		.name = "tx_green_prio_3",

		.offset = 0x99,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_4] = {

		.name = "tx_green_prio_4",

		.offset = 0x9A,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_5] = {

		.name = "tx_green_prio_5",

		.offset = 0x9B,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_6] = {

		.name = "tx_green_prio_6",

		.offset = 0x9C,

	},

	[OCELOT_STAT_TX_GREEN_PRIO_7] = {

		.name = "tx_green_prio_7",

		.offset = 0x9D,

	},

	[OCELOT_STAT_TX_AGED] = {

		.name = "tx_aged",

		.offset = 0x9E,

	},

	[OCELOT_STAT_DROP_LOCAL] = {

		.name = "drop_local",

		.offset = 0x100,

	},

	[OCELOT_STAT_DROP_TAIL] = {

		.name = "drop_tail",

		.offset = 0x101,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_0] = {

		.name = "drop_yellow_prio_0",

		.offset = 0x102,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_1] = {

		.name = "drop_yellow_prio_1",

		.offset = 0x103,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_2] = {

		.name = "drop_yellow_prio_2",

		.offset = 0x104,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_3] = {

		.name = "drop_yellow_prio_3",

		.offset = 0x105,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_4] = {

		.name = "drop_yellow_prio_4",

		.offset = 0x106,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_5] = {

		.name = "drop_yellow_prio_5",

		.offset = 0x107,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_6] = {

		.name = "drop_yellow_prio_6",

		.offset = 0x108,

	},

	[OCELOT_STAT_DROP_YELLOW_PRIO_7] = {

		.name = "drop_yellow_prio_7",

		.offset = 0x109,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_0] = {

		.name = "drop_green_prio_0",

		.offset = 0x10A,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_1] = {

		.name = "drop_green_prio_1",

		.offset = 0x10B,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_2] = {

		.name = "drop_green_prio_2",

		.offset = 0x10C,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_3] = {

		.name = "drop_green_prio_3",

		.offset = 0x10D,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_4] = {

		.name = "drop_green_prio_4",

		.offset = 0x10E,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_5] = {

		.name = "drop_green_prio_5",

		.offset = 0x10F,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_6] = {

		.name = "drop_green_prio_6",

		.offset = 0x110,

	},

	[OCELOT_STAT_DROP_GREEN_PRIO_7] = {

		.name = "drop_green_prio_7",

		.offset = 0x111,

	},

};



static const struct vcap_field vsc9959_vcap_es0_keys[] = {

drivers/net/dsa/ocelot/seville_vsc9953.c

+373 −95

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/mscc/ocelot.c

+27 −13
Original line number Diff line number Diff line
@@ -1860,16 +1860,20 @@ void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data) 
	if (sset != ETH_SS_STATS)

		return;



	for (i = 0; i < ocelot->num_stats; i++)

	for (i = 0; i < OCELOT_NUM_STATS; i++) {

		if (ocelot->stats_layout[i].name[0] == '\0')

			continue;



		memcpy(data + i * ETH_GSTRING_LEN, ocelot->stats_layout[i].name,

		       ETH_GSTRING_LEN);

	}

}

EXPORT_SYMBOL(ocelot_get_strings);



/* Caller must hold &ocelot->stats_lock */

static int ocelot_port_update_stats(struct ocelot *ocelot, int port)

{

	unsigned int idx = port * ocelot->num_stats;

	unsigned int idx = port * OCELOT_NUM_STATS;

	struct ocelot_stats_region *region;

	int err, j;
@@ -1930,9 +1934,15 @@ void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data) 
	/* check and update now */

	err = ocelot_port_update_stats(ocelot, port);



	/* Copy all counters */

	for (i = 0; i < ocelot->num_stats; i++)

		*data++ = ocelot->stats[port * ocelot->num_stats + i];

	/* Copy all supported counters */

	for (i = 0; i < OCELOT_NUM_STATS; i++) {

		int index = port * OCELOT_NUM_STATS + i;



		if (ocelot->stats_layout[i].name[0] == '\0')

			continue;



		*data++ = ocelot->stats[index];

	}



	spin_unlock(&ocelot->stats_lock);
@@ -1943,10 +1953,16 @@ EXPORT_SYMBOL(ocelot_get_ethtool_stats); 


int ocelot_get_sset_count(struct ocelot *ocelot, int port, int sset)

{

	int i, num_stats = 0;



	if (sset != ETH_SS_STATS)

		return -EOPNOTSUPP;



	return ocelot->num_stats;

	for (i = 0; i < OCELOT_NUM_STATS; i++)

		if (ocelot->stats_layout[i].name[0] != '\0')

			num_stats++;



	return num_stats;

}

EXPORT_SYMBOL(ocelot_get_sset_count);
@@ -1958,7 +1974,10 @@ static int ocelot_prepare_stats_regions(struct ocelot *ocelot) 


	INIT_LIST_HEAD(&ocelot->stats_regions);



	for (i = 0; i < ocelot->num_stats; i++) {

	for (i = 0; i < OCELOT_NUM_STATS; i++) {

		if (ocelot->stats_layout[i].name[0] == '\0')

			continue;



		if (region && ocelot->stats_layout[i].offset == last + 1) {

			region->count++;

		} else {
@@ -3340,7 +3359,6 @@ 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;
@@ -3353,12 +3371,8 @@ 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,

				     ocelot->num_phys_ports * OCELOT_NUM_STATS,

				     sizeof(u64), GFP_KERNEL);

	if (!ocelot->stats)

		return -ENOMEM;

drivers/net/ethernet/mscc/ocelot_vsc7514.c

+373 −95

File changed.

Preview size limit exceeded, changes collapsed.

include/soc/mscc/ocelot.h

+97 −8
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ 
#define REG_RESERVED_ADDR		0xffffffff

#define REG_RESERVED(reg)		REG(reg, REG_RESERVED_ADDR)



#define for_each_stat(ocelot, stat)				\

	for ((stat) = (ocelot)->stats_layout;			\

	     ((stat)->name[0] != '\0');				\

	     (stat)++)



enum ocelot_target {

	ANA = 1,

	QS,
@@ -540,13 +535,108 @@ enum ocelot_ptp_pins { 
	TOD_ACC_PIN

};



enum ocelot_stat {

	OCELOT_STAT_RX_OCTETS,

	OCELOT_STAT_RX_UNICAST,

	OCELOT_STAT_RX_MULTICAST,

	OCELOT_STAT_RX_BROADCAST,

	OCELOT_STAT_RX_SHORTS,

	OCELOT_STAT_RX_FRAGMENTS,

	OCELOT_STAT_RX_JABBERS,

	OCELOT_STAT_RX_CRC_ALIGN_ERRS,

	OCELOT_STAT_RX_SYM_ERRS,

	OCELOT_STAT_RX_64,

	OCELOT_STAT_RX_65_127,

	OCELOT_STAT_RX_128_255,

	OCELOT_STAT_RX_256_511,

	OCELOT_STAT_RX_512_1023,

	OCELOT_STAT_RX_1024_1526,

	OCELOT_STAT_RX_1527_MAX,

	OCELOT_STAT_RX_PAUSE,

	OCELOT_STAT_RX_CONTROL,

	OCELOT_STAT_RX_LONGS,

	OCELOT_STAT_RX_CLASSIFIED_DROPS,

	OCELOT_STAT_RX_RED_PRIO_0,

	OCELOT_STAT_RX_RED_PRIO_1,

	OCELOT_STAT_RX_RED_PRIO_2,

	OCELOT_STAT_RX_RED_PRIO_3,

	OCELOT_STAT_RX_RED_PRIO_4,

	OCELOT_STAT_RX_RED_PRIO_5,

	OCELOT_STAT_RX_RED_PRIO_6,

	OCELOT_STAT_RX_RED_PRIO_7,

	OCELOT_STAT_RX_YELLOW_PRIO_0,

	OCELOT_STAT_RX_YELLOW_PRIO_1,

	OCELOT_STAT_RX_YELLOW_PRIO_2,

	OCELOT_STAT_RX_YELLOW_PRIO_3,

	OCELOT_STAT_RX_YELLOW_PRIO_4,

	OCELOT_STAT_RX_YELLOW_PRIO_5,

	OCELOT_STAT_RX_YELLOW_PRIO_6,

	OCELOT_STAT_RX_YELLOW_PRIO_7,

	OCELOT_STAT_RX_GREEN_PRIO_0,

	OCELOT_STAT_RX_GREEN_PRIO_1,

	OCELOT_STAT_RX_GREEN_PRIO_2,

	OCELOT_STAT_RX_GREEN_PRIO_3,

	OCELOT_STAT_RX_GREEN_PRIO_4,

	OCELOT_STAT_RX_GREEN_PRIO_5,

	OCELOT_STAT_RX_GREEN_PRIO_6,

	OCELOT_STAT_RX_GREEN_PRIO_7,

	OCELOT_STAT_TX_OCTETS,

	OCELOT_STAT_TX_UNICAST,

	OCELOT_STAT_TX_MULTICAST,

	OCELOT_STAT_TX_BROADCAST,

	OCELOT_STAT_TX_COLLISION,

	OCELOT_STAT_TX_DROPS,

	OCELOT_STAT_TX_PAUSE,

	OCELOT_STAT_TX_64,

	OCELOT_STAT_TX_65_127,

	OCELOT_STAT_TX_128_255,

	OCELOT_STAT_TX_256_511,

	OCELOT_STAT_TX_512_1023,

	OCELOT_STAT_TX_1024_1526,

	OCELOT_STAT_TX_1527_MAX,

	OCELOT_STAT_TX_YELLOW_PRIO_0,

	OCELOT_STAT_TX_YELLOW_PRIO_1,

	OCELOT_STAT_TX_YELLOW_PRIO_2,

	OCELOT_STAT_TX_YELLOW_PRIO_3,

	OCELOT_STAT_TX_YELLOW_PRIO_4,

	OCELOT_STAT_TX_YELLOW_PRIO_5,

	OCELOT_STAT_TX_YELLOW_PRIO_6,

	OCELOT_STAT_TX_YELLOW_PRIO_7,

	OCELOT_STAT_TX_GREEN_PRIO_0,

	OCELOT_STAT_TX_GREEN_PRIO_1,

	OCELOT_STAT_TX_GREEN_PRIO_2,

	OCELOT_STAT_TX_GREEN_PRIO_3,

	OCELOT_STAT_TX_GREEN_PRIO_4,

	OCELOT_STAT_TX_GREEN_PRIO_5,

	OCELOT_STAT_TX_GREEN_PRIO_6,

	OCELOT_STAT_TX_GREEN_PRIO_7,

	OCELOT_STAT_TX_AGED,

	OCELOT_STAT_DROP_LOCAL,

	OCELOT_STAT_DROP_TAIL,

	OCELOT_STAT_DROP_YELLOW_PRIO_0,

	OCELOT_STAT_DROP_YELLOW_PRIO_1,

	OCELOT_STAT_DROP_YELLOW_PRIO_2,

	OCELOT_STAT_DROP_YELLOW_PRIO_3,

	OCELOT_STAT_DROP_YELLOW_PRIO_4,

	OCELOT_STAT_DROP_YELLOW_PRIO_5,

	OCELOT_STAT_DROP_YELLOW_PRIO_6,

	OCELOT_STAT_DROP_YELLOW_PRIO_7,

	OCELOT_STAT_DROP_GREEN_PRIO_0,

	OCELOT_STAT_DROP_GREEN_PRIO_1,

	OCELOT_STAT_DROP_GREEN_PRIO_2,

	OCELOT_STAT_DROP_GREEN_PRIO_3,

	OCELOT_STAT_DROP_GREEN_PRIO_4,

	OCELOT_STAT_DROP_GREEN_PRIO_5,

	OCELOT_STAT_DROP_GREEN_PRIO_6,

	OCELOT_STAT_DROP_GREEN_PRIO_7,

	OCELOT_NUM_STATS,

};



struct ocelot_stat_layout {

	u32 offset;

	char name[ETH_GSTRING_LEN];

};



#define OCELOT_STAT_END { .name = "" }



struct ocelot_stats_region {

	struct list_head node;

	u32 offset;
@@ -709,7 +799,6 @@ struct ocelot { 
	const u32 *const		*map;

	const struct ocelot_stat_layout	*stats_layout;

	struct list_head		stats_regions;

	unsigned int			num_stats;



	u32				pool_size[OCELOT_SB_NUM][OCELOT_SB_POOL_NUM];

	int				packet_buffer_size;