From nobody Mon Aug 10 00:29:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hJFxp12Kcz6pLnZ for ; Mon, 10 Aug 2026 00:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJFxn5MyWz3lcC for ; Mon, 10 Aug 2026 00:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786321773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qD/wM1nMYtsBJdo4QDASkBkgYXVcQAhhUCTcKRHW4A=; b=mgKbmA4JQR6LI/DyQpaEeaxTqzFsyRdqF/vfL/5UkfP4PIOcb79/dKp9/DUmHB98nR+BmY DWQj+us/wUAerFiMKCsk4NwlhiAh+T7slwYwQN0WzqGUe7rKTC3kfAEEpc+q5ci50UvCEL vHmofqml9Pl5iZM0dU0O6esPZG7WDKw7zbTssx3YfGL0+oHXjl5aZb4piGTOoLAxGASB/t csPYZr+uFBHiIDmsNld5oipQXzBVQjOmuTiM9WHrZKjM5bD2jWCIrf5oTU50Z8Oll/VkjE oD/A7e8RFosqRcwaVfPjx3KPBp7f3UNXODkTN4wIRBO3qLjXgTT0ZEtcc8XT9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786321773; a=rsa-sha256; cv=none; b=iYSMkWEecLSh6f320kbaGTYMmyJE/jHDUoLwNyrFgc0zvl7bDJigP9Vnx0zLuPX14AM3RE +yZkKhcqJDzMakfJZ3ehzF2tjf4SBHEwz7pOKBPBHrX09N7NP2IcDrV5OANfodKzedxC9k iKqi3+0CRckxLvUjcpp6n+KoGs+4/JNjw8Ij2O31KvjXGDO4YhZeVSuhW9i2UqpwZlYJCL E24eiXGmSZ8yhiwRfF+XJnyidfgnIvG4/CddqZU2AmTkT+r9zbDglyBK8YKfDbGEBqhXgN Es/6U+Iudswsy8FW/vic3i2S68ZoOIhg1lJYYf6N1pLDTP75R5Qj3EMGOmN39g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786321773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qD/wM1nMYtsBJdo4QDASkBkgYXVcQAhhUCTcKRHW4A=; b=v9AS7fSBdDotgi9XIt+42higVC050AadzBPKoPbdkKVHgogIqINXNkFLpTtz7J00xfodFd TUhMDU6vSYJtDcsPMBhhlILzZKBzvUkCnyhiEl4hRY5me0i+vwLHjB0KBbyP9eJLImCA5c +0FxqFyUkKyr09LbvJsOg5SrPH7MeJIByfpmsyjPXRpatXeJuAvrTTe866HhS6IADxG6pY Os3s3/mD7IHz/ZPmgrSVqZM92Y3iIXqMM8kjQWcjrfda9DnsxC94Rlj5xTTcBQr44NxKxD X+ebPQ4QPgXhV8EkLuEywWy1AhUzNpxbi7P9a8pgUFytJA8gPb8eRzr+5qnrJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJFxn3pwzzmkj for ; Mon, 10 Aug 2026 00:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41239 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 00:29:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cb0e8f5fb6de - main - bnxt: Report initialization failures to iflib List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb0e8f5fb6de03428137c096b1c8b62710829029 Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 00:29:33 +0000 Message-Id: <6a791b6d.41239.225730c6@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cb0e8f5fb6de03428137c096b1c8b62710829029 commit cb0e8f5fb6de03428137c096b1c8b62710829029 Author: Kevin Bowling AuthorDate: 2026-08-09 09:37:20 +0000 Commit: Kevin Bowling 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