sfc: ef10: implement ethtool::get_fec_stats

Report what appears to be the standard block counts:
 - 30.5.1.1.17 aFECCorrectedBlocks
 - 30.5.1.1.18 aFECUncorrectableBlocks

Don't report the per-lane symbol counts, if those really
count symbols they are not what the standard calls for
(even if symbols seem like the most useful thing to count.)

Fingers crossed that fec_corrected_errors is not in symbols.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index da6886dcac37c8795714a96fe4dcba08132d7281..c873f961d5a53835828ad39f6b403bff03aedfda 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -1747,6 +1747,22 @@ static size_t efx_ef10_describe_stats(struct efx_nic *efx, u8 *names)
                                      mask, names);
 }
 
+static void efx_ef10_get_fec_stats(struct efx_nic *efx,
+                                  struct ethtool_fec_stats *fec_stats)
+{
+       DECLARE_BITMAP(mask, EF10_STAT_COUNT);
+       struct efx_ef10_nic_data *nic_data = efx->nic_data;
+       u64 *stats = nic_data->stats;
+
+       efx_ef10_get_stat_mask(efx, mask);
+       if (test_bit(EF10_STAT_fec_corrected_errors, mask))
+               fec_stats->corrected_blocks.total =
+                       stats[EF10_STAT_fec_corrected_errors];
+       if (test_bit(EF10_STAT_fec_uncorrected_errors, mask))
+               fec_stats->uncorrectable_blocks.total =
+                       stats[EF10_STAT_fec_uncorrected_errors];
+}
+
 static size_t efx_ef10_update_stats_common(struct efx_nic *efx, u64 *full_stats,
                                           struct rtnl_link_stats64 *core_stats)
 {
@@ -4122,6 +4138,7 @@ const struct efx_nic_type efx_hunt_a0_nic_type = {
        .get_wol = efx_ef10_get_wol,
        .set_wol = efx_ef10_set_wol,
        .resume_wol = efx_port_dummy_op_void,
+       .get_fec_stats = efx_ef10_get_fec_stats,
        .test_chip = efx_ef10_test_chip,
        .test_nvram = efx_mcdi_nvram_test_all,
        .mcdi_request = efx_ef10_mcdi_request,

diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 12a91c559aa2923fa9329b84795b4f2db7c83f12..058d9fe41d99d8bbff424e253926fec667b7470c 100644 (file)
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -206,6 +206,15 @@ static int efx_ethtool_set_wol(struct net_device *net_dev,
        return efx->type->set_wol(efx, wol->wolopts);
 }
 
+static void efx_ethtool_get_fec_stats(struct net_device *net_dev,
+                                     struct ethtool_fec_stats *fec_stats)
+{
+       struct efx_nic *efx = netdev_priv(net_dev);
+
+       if (efx->type->get_fec_stats)
+               efx->type->get_fec_stats(efx, fec_stats);
+}
+
 static int efx_ethtool_get_ts_info(struct net_device *net_dev,
                                   struct ethtool_ts_info *ts_info)
 {
@@ -257,6 +266,7 @@ const struct ethtool_ops efx_ethtool_ops = {
        .get_module_eeprom      = efx_ethtool_get_module_eeprom,
        .get_link_ksettings     = efx_ethtool_get_link_ksettings,
        .set_link_ksettings     = efx_ethtool_set_link_ksettings,
+       .get_fec_stats          = efx_ethtool_get_fec_stats,
        .get_fecparam           = efx_ethtool_get_fecparam,
        .set_fecparam           = efx_ethtool_set_fecparam,
 };

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 9f7dfdf708cf9edec5c1b4a526f157c254341618..9b4b25704271041f3bebdc91d24d45ac4b2d0ff7 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1187,6 +1187,7 @@ struct efx_udp_tunnel {
  * @get_wol: Get WoL configuration from driver state
  * @set_wol: Push WoL configuration to the NIC
  * @resume_wol: Synchronise WoL state between driver and MC (e.g. after resume)
+ * @get_fec_stats: Get standard FEC statistics.
  * @test_chip: Test registers.  May use efx_farch_test_registers(), and is
  *     expected to reset the NIC.
  * @test_nvram: Test validity of NVRAM contents
@@ -1332,6 +1333,8 @@ struct efx_nic_type {
        void (*get_wol)(struct efx_nic *efx, struct ethtool_wolinfo *wol);
        int (*set_wol)(struct efx_nic *efx, u32 type);
        void (*resume_wol)(struct efx_nic *efx);
+       void (*get_fec_stats)(struct efx_nic *efx,
+                             struct ethtool_fec_stats *fec_stats);
        unsigned int (*check_caps)(const struct efx_nic *efx,
                                   u8 flag,
                                   u32 offset);