eth: bnxt: rename ring_err_stats -> ring_drv_stats

We recently added GRO stats to bnxt, which are maintained
by the driver. Having "err" in the name of the struct for
ring stats no longer makes sense (as pointed out by Michael,
see Link).

Rename them to "drv" stats, as these are all maintained
by the driver (even if partially based on info from descriptors).
Michael suggested calling these misc, happy to go back to
that. IMHO "drv" is a bit more meaningful that "misc".

Pure rename using sed, no functional changes.

Link: https://lore.kernel.org/CACKFLimgibJ0qkM1AacZVh8MKKy-pE_AAc4KPKZ7GUqebmXW9A@mail.gmail.com
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20260223203702.4137801-1-kuba@kernel.org
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 fb45e1dd1dd7d06056b59db8df354b18b2555348..ba010bdc1e71e19c5470d9d2ef3cdf903f1a9b6b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -13252,7 +13252,7 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,
        /* Save ring stats before shutdown */
        if (bp->bnapi && irq_re_init) {
                bnxt_get_ring_stats(bp, &bp->net_stats_prev);
-               bnxt_get_ring_err_stats(bp, &bp->ring_err_stats_prev);
+               bnxt_get_ring_drv_stats(bp, &bp->ring_drv_stats_prev);
        }
        if (irq_re_init) {
                bnxt_free_irq(bp);
@@ -13497,8 +13497,8 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
        clear_bit(BNXT_STATE_READ_STATS, &bp->state);
 }
 
-static void bnxt_get_one_ring_err_stats(struct bnxt *bp,
-                                       struct bnxt_total_ring_err_stats *stats,
+static void bnxt_get_one_ring_drv_stats(struct bnxt *bp,
+                                       struct bnxt_total_ring_drv_stats *stats,
                                        struct bnxt_cp_ring_info *cpr)
 {
        struct bnxt_sw_stats *sw_stats = cpr->sw_stats;
@@ -13519,13 +13519,13 @@ static void bnxt_get_one_ring_err_stats(struct bnxt *bp,
        stats->total_missed_irqs += sw_stats->cmn.missed_irqs;
 }
 
-void bnxt_get_ring_err_stats(struct bnxt *bp,
-                            struct bnxt_total_ring_err_stats *stats)
+void bnxt_get_ring_drv_stats(struct bnxt *bp,
+                            struct bnxt_total_ring_drv_stats *stats)
 {
        int i;
 
        for (i = 0; i < bp->cp_nr_rings; i++)
-               bnxt_get_one_ring_err_stats(bp, stats, &bp->bnapi[i]->cp_ring);
+               bnxt_get_one_ring_drv_stats(bp, stats, &bp->bnapi[i]->cp_ring);
 }
 
 static bool bnxt_mc_list_updated(struct bnxt *bp, u32 *rx_mask)
@@ -15970,9 +15970,9 @@ static void bnxt_get_base_stats(struct net_device *dev,
 
        rx->packets = bp->net_stats_prev.rx_packets;
        rx->bytes = bp->net_stats_prev.rx_bytes;
-       rx->alloc_fail = bp->ring_err_stats_prev.rx_total_oom_discards;
-       rx->hw_gro_packets = bp->ring_err_stats_prev.rx_total_hw_gro_packets;
-       rx->hw_gro_wire_packets = bp->ring_err_stats_prev.rx_total_hw_gro_wire_packets;
+       rx->alloc_fail = bp->ring_drv_stats_prev.rx_total_oom_discards;
+       rx->hw_gro_packets = bp->ring_drv_stats_prev.rx_total_hw_gro_packets;
+       rx->hw_gro_wire_packets = bp->ring_drv_stats_prev.rx_total_hw_gro_wire_packets;
 
        tx->packets = bp->net_stats_prev.tx_packets;
        tx->bytes = bp->net_stats_prev.tx_bytes;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 9a41b9e0423c752cb0dce5fe02fa92cba77f869c..90fa3e93c8d66b0969a85f20847dbbc267c0217e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1147,7 +1147,7 @@ struct bnxt_sw_stats {
        struct bnxt_cmn_sw_stats cmn;
 };
 
-struct bnxt_total_ring_err_stats {
+struct bnxt_total_ring_drv_stats {
        u64                     rx_total_l4_csum_errors;
        u64                     rx_total_resets;
        u64                     rx_total_buf_errors;
@@ -2572,7 +2572,7 @@ struct bnxt {
        u8                      pri2cos_idx[8];
        u8                      pri2cos_valid;
 
-       struct bnxt_total_ring_err_stats ring_err_stats_prev;
+       struct bnxt_total_ring_drv_stats ring_drv_stats_prev;
 
        u16                     hwrm_max_req_len;
        u16                     hwrm_max_ext_req_len;
@@ -2974,8 +2974,8 @@ int bnxt_half_open_nic(struct bnxt *bp);
 void bnxt_half_close_nic(struct bnxt *bp);
 void bnxt_reenable_sriov(struct bnxt *bp);
 void bnxt_close_nic(struct bnxt *, bool, bool);
-void bnxt_get_ring_err_stats(struct bnxt *bp,
-                            struct bnxt_total_ring_err_stats *stats);
+void bnxt_get_ring_drv_stats(struct bnxt *bp,
+                            struct bnxt_total_ring_drv_stats *stats);
 bool bnxt_rfs_capable(struct bnxt *bp, bool new_rss_ctx);
 int bnxt_dbg_hwrm_rd_reg(struct bnxt *bp, u32 reg_off, u16 num_words,
                         u32 *reg_buf);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 53a83b6680c405a01575acdfbb1f11cd3b39ed32..283be8767a99b654486be94c98c087d298517f61 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -340,7 +340,7 @@ enum {
        RX_NETPOLL_DISCARDS,
 };
 
-static const char *const bnxt_ring_err_stats_arr[] = {
+static const char *const bnxt_ring_drv_stats_arr[] = {
        "rx_total_l4_csum_errors",
        "rx_total_resets",
        "rx_total_buf_errors",
@@ -500,7 +500,7 @@ static const struct {
        BNXT_TX_STATS_PRI_ENTRIES(tx_packets),
 };
 
-#define BNXT_NUM_RING_ERR_STATS        ARRAY_SIZE(bnxt_ring_err_stats_arr)
+#define BNXT_NUM_RING_DRV_STATS        ARRAY_SIZE(bnxt_ring_drv_stats_arr)
 #define BNXT_NUM_PORT_STATS ARRAY_SIZE(bnxt_port_stats_arr)
 #define BNXT_NUM_STATS_PRI                     \
        (ARRAY_SIZE(bnxt_rx_bytes_pri_arr) +    \
@@ -539,7 +539,7 @@ static int bnxt_get_num_stats(struct bnxt *bp)
        int num_stats = bnxt_get_num_ring_stats(bp);
        int len;
 
-       num_stats += BNXT_NUM_RING_ERR_STATS;
+       num_stats += BNXT_NUM_RING_DRV_STATS;
 
        if (bp->flags & BNXT_FLAG_PORT_STATS)
                num_stats += BNXT_NUM_PORT_STATS;
@@ -594,7 +594,7 @@ static bool is_tx_ring(struct bnxt *bp, int ring_num)
 static void bnxt_get_ethtool_stats(struct net_device *dev,
                                   struct ethtool_stats *stats, u64 *buf)
 {
-       struct bnxt_total_ring_err_stats ring_err_stats = {0};
+       struct bnxt_total_ring_drv_stats ring_drv_stats = {0};
        struct bnxt *bp = netdev_priv(dev);
        u64 *curr, *prev;
        u32 tpa_stats;
@@ -643,12 +643,12 @@ skip_tpa_ring_stats:
                        buf[j] = sw[k];
        }
 
-       bnxt_get_ring_err_stats(bp, &ring_err_stats);
+       bnxt_get_ring_drv_stats(bp, &ring_drv_stats);
 
 skip_ring_stats:
-       curr = &ring_err_stats.rx_total_l4_csum_errors;
-       prev = &bp->ring_err_stats_prev.rx_total_l4_csum_errors;
-       for (i = 0; i < BNXT_NUM_RING_ERR_STATS; i++, j++, curr++, prev++)
+       curr = &ring_drv_stats.rx_total_l4_csum_errors;
+       prev = &bp->ring_drv_stats_prev.rx_total_l4_csum_errors;
+       for (i = 0; i < BNXT_NUM_RING_DRV_STATS; i++, j++, curr++, prev++)
                buf[j] = *curr + *prev;
 
        if (bp->flags & BNXT_FLAG_PORT_STATS) {
@@ -758,8 +758,8 @@ skip_tpa_stats:
                                ethtool_sprintf(&buf, "[%d]: %s", i, str);
                        }
                }
-               for (i = 0; i < BNXT_NUM_RING_ERR_STATS; i++)
-                       ethtool_puts(&buf, bnxt_ring_err_stats_arr[i]);
+               for (i = 0; i < BNXT_NUM_RING_DRV_STATS; i++)
+                       ethtool_puts(&buf, bnxt_ring_drv_stats_arr[i]);
 
                if (bp->flags & BNXT_FLAG_PORT_STATS)
                        for (i = 0; i < BNXT_NUM_PORT_STATS; i++) {