Commit 9cfe8cf5 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Fix 2 stray ethtool -S counters 



The recent firmware interface change has added 2 counters in struct
rx_port_stats_ext. This caused 2 stray ethtool counters to be
displayed.

Since new counters are added from time to time, fix it so that the
ethtool logic will only display up to the maximum known counters.
These 2 counters are not used by production firmware yet.

Fixes: 754fbf60 ("bnxt_en: Update firmware interface to 1.10.2.171")
Reviewed-by: default avatarAjit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20231026013231.53271-1-michael.chan@broadcom.com


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

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+22 −6
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ static int bnxt_get_num_ring_stats(struct bnxt *bp) 
static int bnxt_get_num_stats(struct bnxt *bp)

{

	int num_stats = bnxt_get_num_ring_stats(bp);

	int len;



	num_stats += BNXT_NUM_RING_ERR_STATS;
@@ -542,8 +543,12 @@ static int bnxt_get_num_stats(struct bnxt *bp) 
		num_stats += BNXT_NUM_PORT_STATS;



	if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) {

		num_stats += bp->fw_rx_stats_ext_size +

			     bp->fw_tx_stats_ext_size;

		len = min_t(int, bp->fw_rx_stats_ext_size,

			    ARRAY_SIZE(bnxt_port_stats_ext_arr));

		num_stats += len;

		len = min_t(int, bp->fw_tx_stats_ext_size,

			    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));

		num_stats += len;

		if (bp->pri2cos_valid)

			num_stats += BNXT_NUM_STATS_PRI;

	}
@@ -653,12 +658,17 @@ static void bnxt_get_ethtool_stats(struct net_device *dev, 
	if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) {

		u64 *rx_port_stats_ext = bp->rx_port_stats_ext.sw_stats;

		u64 *tx_port_stats_ext = bp->tx_port_stats_ext.sw_stats;

		u32 len;



		for (i = 0; i < bp->fw_rx_stats_ext_size; i++, j++) {

		len = min_t(u32, bp->fw_rx_stats_ext_size,

			    ARRAY_SIZE(bnxt_port_stats_ext_arr));

		for (i = 0; i < len; i++, j++) {

			buf[j] = *(rx_port_stats_ext +

				   bnxt_port_stats_ext_arr[i].offset);

		}

		for (i = 0; i < bp->fw_tx_stats_ext_size; i++, j++) {

		len = min_t(u32, bp->fw_tx_stats_ext_size,

			    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));

		for (i = 0; i < len; i++, j++) {

			buf[j] = *(tx_port_stats_ext +

				   bnxt_tx_port_stats_ext_arr[i].offset);

		}
@@ -757,11 +767,17 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf) 
			}

		}

		if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) {

			for (i = 0; i < bp->fw_rx_stats_ext_size; i++) {

			u32 len;



			len = min_t(u32, bp->fw_rx_stats_ext_size,

				    ARRAY_SIZE(bnxt_port_stats_ext_arr));

			for (i = 0; i < len; i++) {

				strcpy(buf, bnxt_port_stats_ext_arr[i].string);

				buf += ETH_GSTRING_LEN;

			}

			for (i = 0; i < bp->fw_tx_stats_ext_size; i++) {

			len = min_t(u32, bp->fw_tx_stats_ext_size,

				    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));

			for (i = 0; i < len; i++) {

				strcpy(buf,

				       bnxt_tx_port_stats_ext_arr[i].string);

				buf += ETH_GSTRING_LEN;