From nobody Mon Aug 24 00:53:25 2026 X-Original-To: dev-commits-src-all@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 4hSspv1Tprz6q2Kj for ; Mon, 24 Aug 2026 00:53:27 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSspt3r8Mz3vR4 for ; Mon, 24 Aug 2026 00:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787532806; 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=r1F6vsdfKVnfOfNL77FIhRq+aFrRyy36GB1cfRBZ+9Y=; b=kRBlrte/2x5ArLgUQzpX+MFhDNs4tm9fhcPjlj5S6BGITsnSK6zonkmFVWlNvx7ukWC+iR uNbSh9bO1B/o38WOCSTZZgBcboHglZqfWkVqqKSgzxtBmWfihUl0yvYekDiD+7JXukWEjF DYwQYnEG5yS48HAzp8jCXxZMNy7Vi+TKEKYfGe77GbYOEOQXYFsVJMklLAMwiyaDGj0qcH 7OiefGzWkmlaLokgQJQp0WKumRrjkUs2he1e6ehfbFspIBofoET5xN/i8vexlZFA6MMGDC BP9vmyN388zLK5xsOdtjqBJDh55pzmyt9qWkHXolMLMRKOKJXLRkVTcrrvsoOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787532806; a=rsa-sha256; cv=none; b=wU7H6rO6nIwGhWvxFGXxtIDiDk1/OPLM8ZxJa+KdxgVt3fJoQ1MktmTF6u0688JbhCHcLv F1yWuMwphxZyo96VnuDCyBbO+3SyEzugW22oigmXOYjvB3SXYWBGh0HCE/++xL6TYlFBaW 1bebjD+SoQXEyHldq5Fny31TNm4JkoTg+Ii+qQ4uwlceMicIKZtaHsMr2FuQGBcyJqIzkd lqjG4wp8/5wferMn4lYqvn3Iixv37/zfCnWdd6thRKA22Ue85T3/kCU/QTFI1fLtuqNE7T wiw2viqoYtpZODDg7x4Lkr4lJ1v7vrpP2lEw8tJaxRLc280OPyuO/ZPpNEw4SA== 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=1787532806; 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=r1F6vsdfKVnfOfNL77FIhRq+aFrRyy36GB1cfRBZ+9Y=; b=oI5lI/T2PFt+k67azag2zLsJC9c6CXcieIKxWqJzMxFBFf6qSjw0IbkPQYOG9ayCtOiIRm dyIfGZs4/CmEkczuXzaXL3lmdstektUTrgMOaGycyQUh6aQHH4w2W7kf4gWQ9D5mXc8N+P joty4Df1ATk3DfXO8AOQ9l/Mx2pUZxcN/9Ytnu7oD7D5pBHd2lxX5Rq9LKl0GIukJmKwSf jARJeSfVe0Ccw+Uub84g/cokCz1zhepTHluX3ZcesI8ROSw88Kt7gKZ0Mwy/9LzlLACa3l BKLuAo/Y/MP28Waz7sgkGbDwkm2utb/7yg1SLbUPaT2yCiu/EhisFy+9IydrlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSsps651hzjLC for ; Mon, 24 Aug 2026 00:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 321e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 00:53:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 33bc5805a8a9 - stable/15 - bnxt: Report initialization failures to iflib List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 33bc5805a8a92ccfd4605aa9fd389b2951dd37d2 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 00:53:25 +0000 Message-Id: <6a8b9605.321e3.689a229c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=33bc5805a8a92ccfd4605aa9fd389b2951dd37d2 commit 33bc5805a8a92ccfd4605aa9fd389b2951dd37d2 Author: Kevin Bowling AuthorDate: 2026-08-09 09:37:20 +0000 Commit: Kevin Bowling CommitDate: 2026-08-24 00:44:05 +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. (cherry picked from commit cb0e8f5fb6de03428137c096b1c8b62710829029) --- 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 9988088b3178..79047490455b 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -198,6 +198,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); @@ -2073,7 +2074,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)) { @@ -3022,6 +3025,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; @@ -3031,7 +3042,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); } @@ -3202,12 +3213,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