iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: Add "eth-mac" counter group support

Browse Source 
Report the applicable subset of an mv88e6xxx port's counters using
ethtool's standardized "eth-mac" counter group.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Waldekranz 2023-12-14 14:50:26 +01:00 committed by David S. Miller
parent 5780acbd24
commit 0e047cec77
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -1331,6 +1331,44 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
mv88e6xxx_get_stats(chip, port, data);
}
static void mv88e6xxx_get_eth_mac_stats(struct dsa_switch *ds, int port,
struct ethtool_eth_mac_stats *mac_stats)
{
struct mv88e6xxx_chip *chip = ds->priv;
int ret;
ret = mv88e6xxx_stats_snapshot(chip, port);
if (ret < 0)
return;
#define MV88E6XXX_ETH_MAC_STAT_MAP(_id, _member) \
mv88e6xxx_stats_get_stat(chip, port, \
&mv88e6xxx_hw_stats[MV88E6XXX_HW_STAT_ID_ ## _id], \
&mac_stats->stats._member)
MV88E6XXX_ETH_MAC_STAT_MAP(out_unicast, FramesTransmittedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(single, SingleCollisionFrames);
MV88E6XXX_ETH_MAC_STAT_MAP(multiple, MultipleCollisionFrames);
MV88E6XXX_ETH_MAC_STAT_MAP(in_unicast, FramesReceivedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(in_fcs_error, FrameCheckSequenceErrors);
MV88E6XXX_ETH_MAC_STAT_MAP(out_octets, OctetsTransmittedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(deferred, FramesWithDeferredXmissions);
MV88E6XXX_ETH_MAC_STAT_MAP(late, LateCollisions);
MV88E6XXX_ETH_MAC_STAT_MAP(in_good_octets, OctetsReceivedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(out_multicasts, MulticastFramesXmittedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(out_broadcasts, BroadcastFramesXmittedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(excessive, FramesWithExcessiveDeferral);
MV88E6XXX_ETH_MAC_STAT_MAP(in_multicasts, MulticastFramesReceivedOK);
MV88E6XXX_ETH_MAC_STAT_MAP(in_broadcasts, BroadcastFramesReceivedOK);
#undef MV88E6XXX_ETH_MAC_STAT_MAP
mac_stats->stats.FramesTransmittedOK += mac_stats->stats.MulticastFramesXmittedOK;
mac_stats->stats.FramesTransmittedOK += mac_stats->stats.BroadcastFramesXmittedOK;
mac_stats->stats.FramesReceivedOK += mac_stats->stats.MulticastFramesReceivedOK;
mac_stats->stats.FramesReceivedOK += mac_stats->stats.BroadcastFramesReceivedOK;
}
static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)
{
struct mv88e6xxx_chip *chip = ds->priv;
@ -6852,6 +6890,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
.phylink_mac_link_up = mv88e6xxx_mac_link_up,
.get_strings = mv88e6xxx_get_strings,
.get_ethtool_stats = mv88e6xxx_get_ethtool_stats,
.get_eth_mac_stats = mv88e6xxx_get_eth_mac_stats,
.get_sset_count = mv88e6xxx_get_sset_count,
.port_max_mtu = mv88e6xxx_get_max_mtu,
.port_change_mtu = mv88e6xxx_change_mtu,