Commit 5780acbd authored by Tobias Waldekranz's avatar Tobias Waldekranz Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Give each hw stat an ID 



With the upcoming standard counter group support, we are no longer
reading out the whole set of counters, but rather mapping a subset to
the requested group.

Therefore, create an enum with an ID for each stat, such that
mv88e6xxx_hw_stats[] can be subscripted with a human-readable ID
corresponding to the counter's name.

Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarTobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc82a08a

drivers/net/dsa/mv88e6xxx/chip.c

+75 −63
Original line number Diff line number Diff line
@@ -955,66 +955,78 @@ static int mv88e6xxx_stats_snapshot(struct mv88e6xxx_chip *chip, int port) 
	return err;

}



static struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {

	{ "in_good_octets",		8, 0x00, STATS_TYPE_BANK0, },

	{ "in_bad_octets",		4, 0x02, STATS_TYPE_BANK0, },

	{ "in_unicast",			4, 0x04, STATS_TYPE_BANK0, },

	{ "in_broadcasts",		4, 0x06, STATS_TYPE_BANK0, },

	{ "in_multicasts",		4, 0x07, STATS_TYPE_BANK0, },

	{ "in_pause",			4, 0x16, STATS_TYPE_BANK0, },

	{ "in_undersize",		4, 0x18, STATS_TYPE_BANK0, },

	{ "in_fragments",		4, 0x19, STATS_TYPE_BANK0, },

	{ "in_oversize",		4, 0x1a, STATS_TYPE_BANK0, },

	{ "in_jabber",			4, 0x1b, STATS_TYPE_BANK0, },

	{ "in_rx_error",		4, 0x1c, STATS_TYPE_BANK0, },

	{ "in_fcs_error",		4, 0x1d, STATS_TYPE_BANK0, },

	{ "out_octets",			8, 0x0e, STATS_TYPE_BANK0, },

	{ "out_unicast",		4, 0x10, STATS_TYPE_BANK0, },

	{ "out_broadcasts",		4, 0x13, STATS_TYPE_BANK0, },

	{ "out_multicasts",		4, 0x12, STATS_TYPE_BANK0, },

	{ "out_pause",			4, 0x15, STATS_TYPE_BANK0, },

	{ "excessive",			4, 0x11, STATS_TYPE_BANK0, },

	{ "collisions",			4, 0x1e, STATS_TYPE_BANK0, },

	{ "deferred",			4, 0x05, STATS_TYPE_BANK0, },

	{ "single",			4, 0x14, STATS_TYPE_BANK0, },

	{ "multiple",			4, 0x17, STATS_TYPE_BANK0, },

	{ "out_fcs_error",		4, 0x03, STATS_TYPE_BANK0, },

	{ "late",			4, 0x1f, STATS_TYPE_BANK0, },

	{ "hist_64bytes",		4, 0x08, STATS_TYPE_BANK0, },

	{ "hist_65_127bytes",		4, 0x09, STATS_TYPE_BANK0, },

	{ "hist_128_255bytes",		4, 0x0a, STATS_TYPE_BANK0, },

	{ "hist_256_511bytes",		4, 0x0b, STATS_TYPE_BANK0, },

	{ "hist_512_1023bytes",		4, 0x0c, STATS_TYPE_BANK0, },

	{ "hist_1024_max_bytes",	4, 0x0d, STATS_TYPE_BANK0, },

	{ "sw_in_discards",		4, 0x10, STATS_TYPE_PORT, },

	{ "sw_in_filtered",		2, 0x12, STATS_TYPE_PORT, },

	{ "sw_out_filtered",		2, 0x13, STATS_TYPE_PORT, },

	{ "in_discards",		4, 0x00, STATS_TYPE_BANK1, },

	{ "in_filtered",		4, 0x01, STATS_TYPE_BANK1, },

	{ "in_accepted",		4, 0x02, STATS_TYPE_BANK1, },

	{ "in_bad_accepted",		4, 0x03, STATS_TYPE_BANK1, },

	{ "in_good_avb_class_a",	4, 0x04, STATS_TYPE_BANK1, },

	{ "in_good_avb_class_b",	4, 0x05, STATS_TYPE_BANK1, },

	{ "in_bad_avb_class_a",		4, 0x06, STATS_TYPE_BANK1, },

	{ "in_bad_avb_class_b",		4, 0x07, STATS_TYPE_BANK1, },

	{ "tcam_counter_0",		4, 0x08, STATS_TYPE_BANK1, },

	{ "tcam_counter_1",		4, 0x09, STATS_TYPE_BANK1, },

	{ "tcam_counter_2",		4, 0x0a, STATS_TYPE_BANK1, },

	{ "tcam_counter_3",		4, 0x0b, STATS_TYPE_BANK1, },

	{ "in_da_unknown",		4, 0x0e, STATS_TYPE_BANK1, },

	{ "in_management",		4, 0x0f, STATS_TYPE_BANK1, },

	{ "out_queue_0",		4, 0x10, STATS_TYPE_BANK1, },

	{ "out_queue_1",		4, 0x11, STATS_TYPE_BANK1, },

	{ "out_queue_2",		4, 0x12, STATS_TYPE_BANK1, },

	{ "out_queue_3",		4, 0x13, STATS_TYPE_BANK1, },

	{ "out_queue_4",		4, 0x14, STATS_TYPE_BANK1, },

	{ "out_queue_5",		4, 0x15, STATS_TYPE_BANK1, },

	{ "out_queue_6",		4, 0x16, STATS_TYPE_BANK1, },

	{ "out_queue_7",		4, 0x17, STATS_TYPE_BANK1, },

	{ "out_cut_through",		4, 0x18, STATS_TYPE_BANK1, },

	{ "out_octets_a",		4, 0x1a, STATS_TYPE_BANK1, },

	{ "out_octets_b",		4, 0x1b, STATS_TYPE_BANK1, },

	{ "out_management",		4, 0x1f, STATS_TYPE_BANK1, },

#define MV88E6XXX_HW_STAT_MAPPER(_fn)				    \

	_fn(in_good_octets,		8, 0x00, STATS_TYPE_BANK0), \

	_fn(in_bad_octets,		4, 0x02, STATS_TYPE_BANK0), \

	_fn(in_unicast,			4, 0x04, STATS_TYPE_BANK0), \

	_fn(in_broadcasts,		4, 0x06, STATS_TYPE_BANK0), \

	_fn(in_multicasts,		4, 0x07, STATS_TYPE_BANK0), \

	_fn(in_pause,			4, 0x16, STATS_TYPE_BANK0), \

	_fn(in_undersize,		4, 0x18, STATS_TYPE_BANK0), \

	_fn(in_fragments,		4, 0x19, STATS_TYPE_BANK0), \

	_fn(in_oversize,		4, 0x1a, STATS_TYPE_BANK0), \

	_fn(in_jabber,			4, 0x1b, STATS_TYPE_BANK0), \

	_fn(in_rx_error,		4, 0x1c, STATS_TYPE_BANK0), \

	_fn(in_fcs_error,		4, 0x1d, STATS_TYPE_BANK0), \

	_fn(out_octets,			8, 0x0e, STATS_TYPE_BANK0), \

	_fn(out_unicast,		4, 0x10, STATS_TYPE_BANK0), \

	_fn(out_broadcasts,		4, 0x13, STATS_TYPE_BANK0), \

	_fn(out_multicasts,		4, 0x12, STATS_TYPE_BANK0), \

	_fn(out_pause,			4, 0x15, STATS_TYPE_BANK0), \

	_fn(excessive,			4, 0x11, STATS_TYPE_BANK0), \

	_fn(collisions,			4, 0x1e, STATS_TYPE_BANK0), \

	_fn(deferred,			4, 0x05, STATS_TYPE_BANK0), \

	_fn(single,			4, 0x14, STATS_TYPE_BANK0), \

	_fn(multiple,			4, 0x17, STATS_TYPE_BANK0), \

	_fn(out_fcs_error,		4, 0x03, STATS_TYPE_BANK0), \

	_fn(late,			4, 0x1f, STATS_TYPE_BANK0), \

	_fn(hist_64bytes,		4, 0x08, STATS_TYPE_BANK0), \

	_fn(hist_65_127bytes,		4, 0x09, STATS_TYPE_BANK0), \

	_fn(hist_128_255bytes,		4, 0x0a, STATS_TYPE_BANK0), \

	_fn(hist_256_511bytes,		4, 0x0b, STATS_TYPE_BANK0), \

	_fn(hist_512_1023bytes,		4, 0x0c, STATS_TYPE_BANK0), \

	_fn(hist_1024_max_bytes,	4, 0x0d, STATS_TYPE_BANK0), \

	_fn(sw_in_discards,		4, 0x10, STATS_TYPE_PORT), \

	_fn(sw_in_filtered,		2, 0x12, STATS_TYPE_PORT), \

	_fn(sw_out_filtered,		2, 0x13, STATS_TYPE_PORT), \

	_fn(in_discards,		4, 0x00, STATS_TYPE_BANK1), \

	_fn(in_filtered,		4, 0x01, STATS_TYPE_BANK1), \

	_fn(in_accepted,		4, 0x02, STATS_TYPE_BANK1), \

	_fn(in_bad_accepted,		4, 0x03, STATS_TYPE_BANK1), \

	_fn(in_good_avb_class_a,	4, 0x04, STATS_TYPE_BANK1), \

	_fn(in_good_avb_class_b,	4, 0x05, STATS_TYPE_BANK1), \

	_fn(in_bad_avb_class_a,		4, 0x06, STATS_TYPE_BANK1), \

	_fn(in_bad_avb_class_b,		4, 0x07, STATS_TYPE_BANK1), \

	_fn(tcam_counter_0,		4, 0x08, STATS_TYPE_BANK1), \

	_fn(tcam_counter_1,		4, 0x09, STATS_TYPE_BANK1), \

	_fn(tcam_counter_2,		4, 0x0a, STATS_TYPE_BANK1), \

	_fn(tcam_counter_3,		4, 0x0b, STATS_TYPE_BANK1), \

	_fn(in_da_unknown,		4, 0x0e, STATS_TYPE_BANK1), \

	_fn(in_management,		4, 0x0f, STATS_TYPE_BANK1), \

	_fn(out_queue_0,		4, 0x10, STATS_TYPE_BANK1), \

	_fn(out_queue_1,		4, 0x11, STATS_TYPE_BANK1), \

	_fn(out_queue_2,		4, 0x12, STATS_TYPE_BANK1), \

	_fn(out_queue_3,		4, 0x13, STATS_TYPE_BANK1), \

	_fn(out_queue_4,		4, 0x14, STATS_TYPE_BANK1), \

	_fn(out_queue_5,		4, 0x15, STATS_TYPE_BANK1), \

	_fn(out_queue_6,		4, 0x16, STATS_TYPE_BANK1), \

	_fn(out_queue_7,		4, 0x17, STATS_TYPE_BANK1), \

	_fn(out_cut_through,		4, 0x18, STATS_TYPE_BANK1), \

	_fn(out_octets_a,		4, 0x1a, STATS_TYPE_BANK1), \

	_fn(out_octets_b,		4, 0x1b, STATS_TYPE_BANK1), \

	_fn(out_management,		4, 0x1f, STATS_TYPE_BANK1), \

	/*  */



#define MV88E6XXX_HW_STAT_ENTRY(_string, _size, _reg, _type) \

	{ #_string, _size, _reg, _type }

static const struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {

	MV88E6XXX_HW_STAT_MAPPER(MV88E6XXX_HW_STAT_ENTRY)

};



#define MV88E6XXX_HW_STAT_ENUM(_string, _size, _reg, _type) \

	MV88E6XXX_HW_STAT_ID_ ## _string

enum mv88e6xxx_hw_stat_id {

	MV88E6XXX_HW_STAT_MAPPER(MV88E6XXX_HW_STAT_ENUM)

};



static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
@@ -1061,7 +1073,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, 
static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip,

				       uint8_t *data, int types)

{

	struct mv88e6xxx_hw_stat *stat;

	const struct mv88e6xxx_hw_stat *stat;

	int i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
@@ -1142,7 +1154,7 @@ static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port, 
static int mv88e6xxx_stats_get_sset_count(struct mv88e6xxx_chip *chip,

					  int types)

{

	struct mv88e6xxx_hw_stat *stat;

	const struct mv88e6xxx_hw_stat *stat;

	int i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
@@ -1269,7 +1281,7 @@ static size_t mv88e6xxx_stats_get_stat(struct mv88e6xxx_chip *chip, int port, 
static size_t mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port,

					uint64_t *data)

{

	struct mv88e6xxx_hw_stat *stat;

	const struct mv88e6xxx_hw_stat *stat;

	size_t i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {