Commit c79493c3 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: enetc: fix aggregate RMON counters not showing the ranges 



When running "ethtool -S eno0 --groups rmon" without an explicit "--src
emac|pmac" argument, the kernel will not report
rx-rmon-etherStatsPkts64to64Octets, rx-rmon-etherStatsPkts65to127Octets,
etc. This is because on ETHTOOL_MAC_STATS_SRC_AGGREGATE, we do not
populate the "ranges" argument.

ocelot_port_get_rmon_stats() does things differently and things work
there. I had forgotten to make sure that the code is structured the same
way in both drivers, so do that now.

Fixes: cf52bd23 ("net: enetc: add support for MAC Merge statistics counters")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230321232831.1200905-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bb765a74

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

+5 −6
Original line number Diff line number Diff line
@@ -370,8 +370,7 @@ static const struct ethtool_rmon_hist_range enetc_rmon_ranges[] = { 
};



static void enetc_rmon_stats(struct enetc_hw *hw, int mac,

			     struct ethtool_rmon_stats *s,

			     const struct ethtool_rmon_hist_range **ranges)

			     struct ethtool_rmon_stats *s)

{

	s->undersize_pkts = enetc_port_rd(hw, ENETC_PM_RUND(mac));

	s->oversize_pkts = enetc_port_rd(hw, ENETC_PM_ROVR(mac));
@@ -393,8 +392,6 @@ static void enetc_rmon_stats(struct enetc_hw *hw, int mac, 
	s->hist_tx[4] = enetc_port_rd(hw, ENETC_PM_T1023(mac));

	s->hist_tx[5] = enetc_port_rd(hw, ENETC_PM_T1522(mac));

	s->hist_tx[6] = enetc_port_rd(hw, ENETC_PM_T1523X(mac));



	*ranges = enetc_rmon_ranges;

}



static void enetc_get_eth_mac_stats(struct net_device *ndev,
@@ -447,13 +444,15 @@ static void enetc_get_rmon_stats(struct net_device *ndev, 
	struct enetc_hw *hw = &priv->si->hw;

	struct enetc_si *si = priv->si;



	*ranges = enetc_rmon_ranges;



	switch (rmon_stats->src) {

	case ETHTOOL_MAC_STATS_SRC_EMAC:

		enetc_rmon_stats(hw, 0, rmon_stats, ranges);

		enetc_rmon_stats(hw, 0, rmon_stats);

		break;

	case ETHTOOL_MAC_STATS_SRC_PMAC:

		if (si->hw_features & ENETC_SI_F_QBU)

			enetc_rmon_stats(hw, 1, rmon_stats, ranges);

			enetc_rmon_stats(hw, 1, rmon_stats);

		break;

	case ETHTOOL_MAC_STATS_SRC_AGGREGATE:

		ethtool_aggregate_rmon_stats(ndev, rmon_stats);