Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d94619cd authored by Daniel Pieczko's avatar Daniel Pieczko Committed by David S. Miller
Browse files

sfc: suppress vadaptor stats when EVB is not present 



The raw_mask array is not initialised, so it needs to be
explicitly set to zero in the 'else' branch.

If the EVB capability is not present, a port cannot have multiple
functions so the per-port MAC stats are correct and should match
the corresponding vadaptor stats, so this redundancy can be
removed from the ethtool stats output.

Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6dd4859b

drivers/net/ethernet/sfc/ef10.c

+9 −3
Original line number Diff line number Diff line
@@ -1162,13 +1162,19 @@ static u64 efx_ef10_raw_stat_mask(struct efx_nic *efx) 


static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask)

{

	struct efx_ef10_nic_data *nic_data = efx->nic_data;

	u64 raw_mask[2];



	raw_mask[0] = efx_ef10_raw_stat_mask(efx);



	/* All functions see the vadaptor stats */

	/* Only show vadaptor stats when EVB capability is present */

	if (nic_data->datapath_caps &

	    (1 << MC_CMD_GET_CAPABILITIES_OUT_EVB_LBN)) {

		raw_mask[0] |= ~((1ULL << EF10_STAT_rx_unicast) - 1);

		raw_mask[1] = (1ULL << (EF10_STAT_COUNT - 63)) - 1;

	} else {

		raw_mask[1] = 0;

	}



#if BITS_PER_LONG == 64

	mask[0] = raw_mask[0];

drivers/net/ethernet/sfc/mcdi_pcol.h

+2 −0
Original line number Diff line number Diff line
@@ -5600,6 +5600,8 @@ 
#define        MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_WIDTH 1

#define        MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN 27

#define        MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_WIDTH 1

#define        MC_CMD_GET_CAPABILITIES_OUT_EVB_LBN 30

#define        MC_CMD_GET_CAPABILITIES_OUT_EVB_WIDTH 1

/* RxDPCPU firmware id. */

#define       MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_OFST 4

#define       MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_LEN 2