bnxt_en: Don't assume XDP is never enabled in bnxt_init_dflt_ring_mode()

The original code made the assumption that when we set up the initial
default ring mode, we must be just loading the driver and XDP cannot
be enabled yet.  This is not true when the FW goes through a resource
or capability change.  Resource reservations will be cancelled and
reinitialized with XDP already enabled.  devlink reload with XDP enabled
will also have the same issue.  This scenario will cause the ring
arithmetic to be all wrong in the bnxt_init_dflt_ring_mode() path
causing failure:

bnxt_en 0000:a1:00.0 ens2f0np0: bnxt_setup_int_mode err: ffffffea
bnxt_en 0000:a1:00.0 ens2f0np0: bnxt_request_irq err: ffffffea
bnxt_en 0000:a1:00.0 ens2f0np0: nic open fail (rc: ffffffea)

Fix it by properly accounting for XDP in the bnxt_init_dflt_ring_mode()
path by using the refactored helper functions in the previous patch.

Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Fixes: ec5d31e3c15d ("bnxt_en: Handle firmware reset status during IF_UP.")
Fixes: 228ea8c187d8 ("bnxt_en: implement devlink dev reload driver_reinit")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20260331065138.948205-3-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 173f962fc2abe052f6c85467934b3a11ad120741..f11f3a704da54ee31f568bbeb91c24b256045a25 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -16547,6 +16547,10 @@ static void bnxt_adj_dflt_rings(struct bnxt *bp, bool sh)
        else
                bp->cp_nr_rings = bp->tx_nr_rings_per_tc + bp->rx_nr_rings;
        bp->tx_nr_rings = bnxt_tx_nr_rings(bp);
+       if (sh && READ_ONCE(bp->xdp_prog)) {
+               bnxt_set_xdp_tx_rings(bp);
+               bnxt_set_cp_rings(bp, true);
+       }
 }
 
 static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
@@ -16588,16 +16592,17 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
        rc = __bnxt_reserve_rings(bp);
        if (rc && rc != -ENODEV)
                netdev_warn(bp->dev, "Unable to reserve tx rings\n");
-       bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
+
+       bnxt_adj_tx_rings(bp);
        if (sh)
-               bnxt_trim_dflt_sh_rings(bp);
+               bnxt_adj_dflt_rings(bp, true);
 
        /* Rings may have been trimmed, re-reserve the trimmed rings. */
        if (bnxt_need_reserve_rings(bp)) {
                rc = __bnxt_reserve_rings(bp);
                if (rc && rc != -ENODEV)
                        netdev_warn(bp->dev, "2nd rings reservation failed.\n");
-               bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
+               bnxt_adj_tx_rings(bp);
        }
        if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {
                bp->rx_nr_rings++;
@@ -16631,7 +16636,7 @@ static int bnxt_init_dflt_ring_mode(struct bnxt *bp)
        if (rc)
                goto init_dflt_ring_err;
 
-       bp->tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);
+       bnxt_adj_tx_rings(bp);
 
        bnxt_set_dflt_rfs(bp);