diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-09-08 19:48:12 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-09-09 10:59:12 +0100 |
| commit | d3e75f1665f37cd7294355dd01bbc72f057a841d (patch) | |
| tree | 4fde00ced82ea174030631e52ed711158425bc20 | |
| parent | net: dsa: felix: use ocelot's ndo_get_stats64 method (diff) | |
| download | linux-dev-d3e75f1665f37cd7294355dd01bbc72f057a841d.tar.xz linux-dev-d3e75f1665f37cd7294355dd01bbc72f057a841d.zip | |
net: mscc: ocelot: exclude stats from bulk regions based on reg, not name
We want to introduce elements kept in ocelot->stats that aren't exposed
to the unstructured ethtool -S (so they won't have their name populated),
but are otherwise checked for 32-bit wraparounds by
ocelot_port_update_stats().
This isn't possible today because ocelot_prepare_stats_regions() skips
over ocelot_stat_layout elements with no name. Now that we've changed
struct ocelot_stat_layout to keep the absolute register address rather
than the offset relative to SYS_CNT, we can make use of the unpopulated
"reg" value of 0 to mean that the counter isn't present on the current
switch revision, and skip it from the preparation of bulk regions.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot_stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/ethernet/mscc/ocelot_stats.c index 64356614e69a..2926d2661af4 100644 --- a/drivers/net/ethernet/mscc/ocelot_stats.c +++ b/drivers/net/ethernet/mscc/ocelot_stats.c @@ -222,7 +222,7 @@ static int ocelot_prepare_stats_regions(struct ocelot *ocelot) INIT_LIST_HEAD(&ocelot->stats_regions); for (i = 0; i < OCELOT_NUM_STATS; i++) { - if (ocelot->stats_layout[i].name[0] == '\0') + if (!ocelot->stats_layout[i].reg) continue; if (region && ocelot->stats_layout[i].reg == last + 4) { |