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

Commit f411b54d authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: expose FEC stats on Medford2 



There's no explicit capability bit, so we just condition them on having
 efx->num_mac_stats >= MC_CMD_MAC_NSTATS_V2.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarBert Kenward <bkenward@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1be4821

drivers/net/ethernet/sfc/ef10.c

+23 −1
Original line number Diff line number Diff line
@@ -1643,6 +1643,12 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { 
	EF10_DMA_STAT(tx_bad, VADAPTER_TX_BAD_PACKETS),

	EF10_DMA_STAT(tx_bad_bytes, VADAPTER_TX_BAD_BYTES),

	EF10_DMA_STAT(tx_overflow, VADAPTER_TX_OVERFLOW),

	EF10_DMA_STAT(fec_uncorrected_errors, FEC_UNCORRECTED_ERRORS),

	EF10_DMA_STAT(fec_corrected_errors, FEC_CORRECTED_ERRORS),

	EF10_DMA_STAT(fec_corrected_symbols_lane0, FEC_CORRECTED_SYMBOLS_LANE0),

	EF10_DMA_STAT(fec_corrected_symbols_lane1, FEC_CORRECTED_SYMBOLS_LANE1),

	EF10_DMA_STAT(fec_corrected_symbols_lane2, FEC_CORRECTED_SYMBOLS_LANE2),

	EF10_DMA_STAT(fec_corrected_symbols_lane3, FEC_CORRECTED_SYMBOLS_LANE3),

};



#define HUNT_COMMON_STAT_MASK ((1ULL << EF10_STAT_port_tx_bytes) |	\
@@ -1718,6 +1724,19 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { 
	(1ULL << EF10_STAT_port_rx_dp_hlb_fetch) |			\

	(1ULL << EF10_STAT_port_rx_dp_hlb_wait))



/* These statistics are only provided if the NIC supports MC_CMD_MAC_STATS_V2,

 * indicated by returning a value >= MC_CMD_MAC_NSTATS_V2 in

 * MC_CMD_GET_CAPABILITIES_V4_OUT_MAC_STATS_NUM_STATS.

 * These bits are in the second u64 of the raw mask.

 */

#define EF10_FEC_STAT_MASK (						\

	(1ULL << (EF10_STAT_fec_uncorrected_errors - 64)) |		\

	(1ULL << (EF10_STAT_fec_corrected_errors - 64)) |		\

	(1ULL << (EF10_STAT_fec_corrected_symbols_lane0 - 64)) |	\

	(1ULL << (EF10_STAT_fec_corrected_symbols_lane1 - 64)) |	\

	(1ULL << (EF10_STAT_fec_corrected_symbols_lane2 - 64)) |	\

	(1ULL << (EF10_STAT_fec_corrected_symbols_lane3 - 64)))



static u64 efx_ef10_raw_stat_mask(struct efx_nic *efx)

{

	u64 raw_mask = HUNT_COMMON_STAT_MASK;
@@ -1756,10 +1775,13 @@ static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask) 
	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;

		raw_mask[1] = (1ULL << (EF10_STAT_V1_COUNT - 64)) - 1;

	} else {

		raw_mask[1] = 0;

	}

	/* Only show FEC stats when NIC supports MC_CMD_MAC_STATS_V2 */

	if (efx->num_mac_stats >= MC_CMD_MAC_NSTATS_V2)

		raw_mask[1] |= EF10_FEC_STAT_MASK;



#if BITS_PER_LONG == 64

	BUILD_BUG_ON(BITS_TO_LONGS(EF10_STAT_COUNT) != 2);

drivers/net/ethernet/sfc/nic.h

+7 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ enum { 
	EF10_STAT_tx_bad,

	EF10_STAT_tx_bad_bytes,

	EF10_STAT_tx_overflow,

	EF10_STAT_V1_COUNT,

	EF10_STAT_fec_uncorrected_errors = EF10_STAT_V1_COUNT,

	EF10_STAT_fec_corrected_errors,

	EF10_STAT_fec_corrected_symbols_lane0,

	EF10_STAT_fec_corrected_symbols_lane1,

	EF10_STAT_fec_corrected_symbols_lane2,

	EF10_STAT_fec_corrected_symbols_lane3,

	EF10_STAT_COUNT

};