net/sfc: fix MAC stats update for stopped device

[dpdk.git] / drivers / net / sfc / sfc_port.c

diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c
index 32a0894..8c432c1 100644 (file)
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -10,6 +10,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_kvargs.h"
 
@@ -25,7 +26,8 @@
 /**
  * Update MAC statistics in the buffer.
  *
- * @param      sa      Adapter
+ * @param      sa              Adapter
+ * @param      force_upload    Flag to upload MAC stats in any case
  *
  * @return Status code
  * @retval     0       Success
@@ -33,7 +35,7 @@
  * @retval     ENOMEM  Memory allocation failure
  */
 int
-sfc_port_update_mac_stats(struct sfc_adapter *sa)
+sfc_port_update_mac_stats(struct sfc_adapter *sa, boolean_t force_upload)
 {
        struct sfc_port *port = &sa->port;
        efsys_mem_t *esmp = &port->mac_stats_dma_mem;
@@ -42,17 +44,17 @@ sfc_port_update_mac_stats(struct sfc_adapter *sa)
        unsigned int nb_attempts = 0;
        int rc;
 
-       SFC_ASSERT(rte_spinlock_is_locked(&port->mac_stats_lock));
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
 
        if (sa->state != SFC_ADAPTER_STARTED)
-               return EINVAL;
+               return 0;
 
        /*
         * If periodic statistics DMA'ing is off or if not supported,
         * make a manual request and keep an eye on timer if need be
         */
        if (!port->mac_stats_periodic_dma_supported ||
-           (port->mac_stats_update_period_ms == 0)) {
+           (port->mac_stats_update_period_ms == 0) || force_upload) {
                if (port->mac_stats_update_period_ms != 0) {
                        uint64_t timestamp = sfc_get_system_msecs();
 
@@ -102,14 +104,13 @@ sfc_port_reset_sw_stats(struct sfc_adapter *sa)
 int
 sfc_port_reset_mac_stats(struct sfc_adapter *sa)
 {
-       struct sfc_port *port = &sa->port;
        int rc;
 
-       rte_spinlock_lock(&port->mac_stats_lock);
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
+
        rc = efx_mac_stats_clear(sa->nic);
        if (rc == 0)
                sfc_port_reset_sw_stats(sa);
-       rte_spinlock_unlock(&port->mac_stats_lock);
 
        return rc;
 }
@@ -157,6 +158,27 @@ sfc_port_phy_caps_to_max_link_speed(uint32_t phy_caps)
 
 #endif
 
+static void
+sfc_port_fill_mac_stats_info(struct sfc_adapter *sa)
+{
+       unsigned int mac_stats_nb_supported = 0;
+       struct sfc_port *port = &sa->port;
+       unsigned int stat_idx;
+
+       efx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,
+                              sizeof(port->mac_stats_mask));
+
+       for (stat_idx = 0; stat_idx < EFX_MAC_NSTATS; ++stat_idx) {
+               if (!EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, stat_idx))
+                       continue;
+
+               port->mac_stats_by_id[mac_stats_nb_supported] = stat_idx;
+               mac_stats_nb_supported++;
+       }
+
+       port->mac_stats_nb_supported = mac_stats_nb_supported;
+}
+
 int
 sfc_port_start(struct sfc_adapter *sa)
 {
@@ -165,7 +187,6 @@ sfc_port_start(struct sfc_adapter *sa)
        uint32_t phy_adv_cap;
        const uint32_t phy_pause_caps =
                ((1u << EFX_PHY_CAP_PAUSE) | (1u << EFX_PHY_CAP_ASYM));
-       unsigned int i;
 
        sfc_log_init(sa, "entry");
 
@@ -259,12 +280,7 @@ sfc_port_start(struct sfc_adapter *sa)
                port->mac_stats_reset_pending = B_FALSE;
        }
 
-       efx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,
-                              sizeof(port->mac_stats_mask));
-
-       for (i = 0, port->mac_stats_nb_supported = 0; i < EFX_MAC_NSTATS; ++i)
-               if (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))
-                       port->mac_stats_nb_supported++;
+       sfc_port_fill_mac_stats_info(sa);
 
        port->mac_stats_update_generation = 0;
 
@@ -352,6 +368,8 @@ sfc_port_stop(struct sfc_adapter *sa)
        (void)efx_mac_stats_periodic(sa->nic, &sa->port.mac_stats_dma_mem,
                                     0, B_FALSE);
 
+       sfc_port_update_mac_stats(sa, B_TRUE);
+
        efx_port_fini(sa->nic);
        efx_filter_fini(sa->nic);
 
@@ -415,8 +433,6 @@ sfc_port_attach(struct sfc_adapter *sa)
                goto fail_mcast_addr_list_buf_alloc;
        }
 
-       rte_spinlock_init(&port->mac_stats_lock);
-
        rc = ENOMEM;
        port->mac_stats_buf = rte_calloc_socket("mac_stats_buf", EFX_MAC_NSTATS,
                                                sizeof(uint64_t), 0,