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

net: mscc: ocelot: fix stat counter register values 



Commit d4c36765 ("net: mscc: ocelot: keep ocelot_stat_layout by reg
address, not offset") organized the stats counters for Ocelot chips, namely
the VSC7512 and VSC7514. A few of the counter offsets were incorrect, and
were caught by this warning:

WARNING: CPU: 0 PID: 24 at drivers/net/ethernet/mscc/ocelot_stats.c:909
ocelot_stats_init+0x1fc/0x2d8
reg 0x5000078 had address 0x220 but reg 0x5000079 has address 0x214,
bulking broken!

Fix these register offsets.

Fixes: d4c36765 ("net: mscc: ocelot: keep ocelot_stat_layout by reg address, not offset")
Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90cbed52

drivers/net/ethernet/mscc/vsc7514_regs.c

+9 −9
Original line number Diff line number Diff line
@@ -307,15 +307,15 @@ static const u32 vsc7514_sys_regmap[] = { 
	REG(SYS_COUNT_DROP_YELLOW_PRIO_4,		0x000218),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_5,		0x00021c),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_6,		0x000220),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,		0x000214),

	REG(SYS_COUNT_DROP_GREEN_PRIO_0,		0x000218),

	REG(SYS_COUNT_DROP_GREEN_PRIO_1,		0x00021c),

	REG(SYS_COUNT_DROP_GREEN_PRIO_2,		0x000220),

	REG(SYS_COUNT_DROP_GREEN_PRIO_3,		0x000224),

	REG(SYS_COUNT_DROP_GREEN_PRIO_4,		0x000228),

	REG(SYS_COUNT_DROP_GREEN_PRIO_5,		0x00022c),

	REG(SYS_COUNT_DROP_GREEN_PRIO_6,		0x000230),

	REG(SYS_COUNT_DROP_GREEN_PRIO_7,		0x000234),

	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,		0x000224),

	REG(SYS_COUNT_DROP_GREEN_PRIO_0,		0x000228),

	REG(SYS_COUNT_DROP_GREEN_PRIO_1,		0x00022c),

	REG(SYS_COUNT_DROP_GREEN_PRIO_2,		0x000230),

	REG(SYS_COUNT_DROP_GREEN_PRIO_3,		0x000234),

	REG(SYS_COUNT_DROP_GREEN_PRIO_4,		0x000238),

	REG(SYS_COUNT_DROP_GREEN_PRIO_5,		0x00023c),

	REG(SYS_COUNT_DROP_GREEN_PRIO_6,		0x000240),

	REG(SYS_COUNT_DROP_GREEN_PRIO_7,		0x000244),

	REG(SYS_RESET_CFG,				0x000508),

	REG(SYS_CMID,					0x00050c),

	REG(SYS_VLAN_ETYPE_CFG,				0x000510),