Commit 0e047cec authored by Tobias Waldekranz's avatar Tobias Waldekranz Committed by David S. Miller
Browse files

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



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

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 5780acbd

drivers/net/dsa/mv88e6xxx/chip.c

+39 −0
Original line number Diff line number Diff line
@@ -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,