git: cb0e8f5fb6de - main - bnxt: Report initialization failures to iflib
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Aug 2026 00:29:33 UTC
The branch main has been updated by kbowling:
URL: https://cgit.FreeBSD.org/src/commit/?id=cb0e8f5fb6de03428137c096b1c8b62710829029
commit cb0e8f5fb6de03428137c096b1c8b62710829029
Author: Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2026-08-09 09:37:20 +0000
Commit: Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-08-10 00:24:02 +0000
bnxt: Report initialization failures to iflib
HWRM failures currently return from the void ifdi_init callback.
iflib then marks the interface running and enables interrupts despite an
incomplete ring or VNIC setup.
Move the hardware setup into an error-returning helper. The ifdi_init
wrapper can report failure through iflib_init_failed(), while firmware
recovery can propagate the same error through bnxt_open(). Also clear
the initialized state after partial setup is torn down.
MFC after: 2 weeks
---
sys/dev/bnxt/bnxt_en/if_bnxt.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c
index abe06f6df1b5..8ecb4770fe0e 100644
--- a/sys/dev/bnxt/bnxt_en/if_bnxt.c
+++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c
@@ -215,6 +215,7 @@ static int bnxt_detach(if_ctx_t ctx);
/* Device configuration */
static void bnxt_init(if_ctx_t ctx);
+static int bnxt_init_hw(if_ctx_t ctx);
static void bnxt_stop(if_ctx_t ctx);
static void bnxt_multi_set(if_ctx_t ctx);
static int bnxt_mtu_set(if_ctx_t ctx, uint32_t mtu);
@@ -2272,7 +2273,9 @@ static int bnxt_open(struct bnxt_softc *bp)
}
bnxt_msix_intr_assign(bp->ctx, 0);
- bnxt_init(bp->ctx);
+ rc = bnxt_init_hw(bp->ctx);
+ if (rc != 0)
+ return (rc);
bnxt_intr_enable(bp->ctx);
if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state)) {
@@ -3277,6 +3280,14 @@ skip_aux_init:
/* Device configuration */
static void
bnxt_init(if_ctx_t ctx)
+{
+
+ if (bnxt_init_hw(ctx) != 0)
+ iflib_init_failed(ctx);
+}
+
+static int
+bnxt_init_hw(if_ctx_t ctx)
{
struct bnxt_softc *softc = iflib_get_softc(ctx);
struct ifmediareq ifmr;
@@ -3286,7 +3297,7 @@ bnxt_init(if_ctx_t ctx)
if (!BNXT_CHIP_P5_PLUS(softc)) {
rc = bnxt_hwrm_func_reset(softc);
if (rc)
- return;
+ return (rc);
} else if (softc->is_dev_init) {
bnxt_stop(ctx);
}
@@ -3461,12 +3472,13 @@ skip_def_cp_ring:
bnxt_get_port_module_status(softc);
bnxt_media_status(softc->ctx, &ifmr);
bnxt_hwrm_cfa_l2_set_rx_mask(softc, &softc->vnic_info);
- return;
+ return (0);
fail:
bnxt_func_reset(softc);
bnxt_clear_ids(softc);
- return;
+ softc->is_dev_init = false;
+ return (rc);
}
static void