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

Commit fbe4307e authored by Bert Kenward's avatar Bert Kenward Committed by David S. Miller
Browse files

sfc: only use vadaptor stats if firmware is capable 



Some of the stats handling code differs based on SR-IOV support,
and SRIOV support is only available if full-featured firmware is
used.
Do not use vadaptor stats if firmware mode is not set to
full-featured.

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

drivers/net/ethernet/sfc/ef10.c

+26 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,12 @@ static size_t efx_ef10_update_stats_common(struct efx_nic *efx, u64 *full_stats, 
		}

	}



	if (core_stats) {

	if (!core_stats)

		return stats_count;



	if (nic_data->datapath_caps &

			1 << MC_CMD_GET_CAPABILITIES_OUT_EVB_LBN) {

		/* Use vadaptor stats. */

		core_stats->rx_packets = stats[EF10_STAT_rx_unicast] +

					 stats[EF10_STAT_rx_multicast] +

					 stats[EF10_STAT_rx_broadcast];
@@ -1302,6 +1307,26 @@ static size_t efx_ef10_update_stats_common(struct efx_nic *efx, u64 *full_stats, 
		core_stats->rx_fifo_errors = stats[EF10_STAT_rx_overflow];

		core_stats->rx_errors = core_stats->rx_crc_errors;

		core_stats->tx_errors = stats[EF10_STAT_tx_bad];

	} else {

		/* Use port stats. */

		core_stats->rx_packets = stats[EF10_STAT_port_rx_packets];

		core_stats->tx_packets = stats[EF10_STAT_port_tx_packets];

		core_stats->rx_bytes = stats[EF10_STAT_port_rx_bytes];

		core_stats->tx_bytes = stats[EF10_STAT_port_tx_bytes];

		core_stats->rx_dropped = stats[EF10_STAT_port_rx_nodesc_drops] +

					 stats[GENERIC_STAT_rx_nodesc_trunc] +

					 stats[GENERIC_STAT_rx_noskb_drops];

		core_stats->multicast = stats[EF10_STAT_port_rx_multicast];

		core_stats->rx_length_errors =

				stats[EF10_STAT_port_rx_gtjumbo] +

				stats[EF10_STAT_port_rx_length_error];

		core_stats->rx_crc_errors = stats[EF10_STAT_port_rx_bad];

		core_stats->rx_frame_errors =

				stats[EF10_STAT_port_rx_align_error];

		core_stats->rx_fifo_errors = stats[EF10_STAT_port_rx_overflow];

		core_stats->rx_errors = (core_stats->rx_length_errors +

					 core_stats->rx_crc_errors +

					 core_stats->rx_frame_errors);

	}



	return stats_count;