bnxt_en: Increment rx_resets counter in bnxt_disable_napi()

If we are doing a complete reset with irq_re_init set to true in
bnxt_close_nic(), all the ring structures will be freed.  New
structures will be allocated in bnxt_open_nic().  The current code
increments rx_resets counter in bnxt_enable_napi() if bnapi->in_reset
is true.  In a complete reset, bnapi->in_reset will never be true
since the structure is just allocated.

Increment the rx_resets counter in bnxt_disable_napi() instead.  This
will allow us to save all the ring error counters including the
rx_resets counters in the next patch.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20230817231911.165035-4-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 73a3936..34c3d23 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9393,10 +9393,14 @@ static void bnxt_disable_napi(struct bnxt *bp)
                return;
 
        for (i = 0; i < bp->cp_nr_rings; i++) {
-               struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
+               struct bnxt_napi *bnapi = bp->bnapi[i];
+               struct bnxt_cp_ring_info *cpr;
 
-               napi_disable(&bp->bnapi[i]->napi);
-               if (bp->bnapi[i]->rx_ring)
+               cpr = &bnapi->cp_ring;
+               if (bnapi->in_reset)
+                       cpr->sw_stats.rx.rx_resets++;
+               napi_disable(&bnapi->napi);
+               if (bnapi->rx_ring)
                        cancel_work_sync(&cpr->dim.work);
        }
 }
@@ -9413,8 +9417,6 @@ static void bnxt_enable_napi(struct bnxt *bp)
                bnapi->tx_fault = 0;
 
                cpr = &bnapi->cp_ring;
-               if (bnapi->in_reset)
-                       cpr->sw_stats.rx.rx_resets++;
                bnapi->in_reset = false;
 
                bnapi->tx_pkts = 0;