From nobody Wed Sep 30 10:41:32 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 4hvs6P38Lpz6vDPF for ; Wed, 30 Sep 2026 10:41:33 +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 4hvs6N6dFGz4N7f for ; Wed, 30 Sep 2026 10:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790764893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKicLv2QsE6460O2CaDTg46b2zyRAnwMaXBqzw/ZGq4=; b=tQy4PV460afzUhMwNcqh47t9XgcmF3dLgmSSWk0pGSGI44J20zOFqRnRNUwE9FnEcJVp5R 2XsfUgBsTx5kdBHPjiMcvA8S8ZLn9DZnNUxF9jl/1ASJoSUxymXYEDIbRlt0cZ497d/eR/ YEvd691K4XTLZeLaWp/GtWPsCAAMk1CrDYhfot+eGXFxFXKYTbqocePYCKETKcylKuXFeR 3X+SJN2uC8CXlwYpHbhzLEls+sPm+b2lUNsfzx5niOx+OWV+Q8sJn2SiWvU4njsjdBu35W Tzwa4zSGukwMX0tBlVEoHAPBdOQ1dQzZdaFpNbhEOvnAxKOgXCa3N1S7MRFGjA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790764893; b=IQf+D+TvEfFuOyc4IvxVFxIaSQ3EFzERIoL/6Xwh16awkdhydMa4PfxXr+/Dsv3Au8Z2/H V62CXw4kD4oj2LyXq//t/9RLBpMRuOe1I+dQH47+2THuog56Ns+ccBiVx6sYIHiD6PDNiI 9PsZwoo8nEfMOUvJ/eBDHiPp4hB0yCeAGpojGOwtftDu9SnC8VAzCn64otCHSA9qmkNAg8 mCJlEc82xUjxb8/R96r6Huu2aWQdjAa3hbdS0XKVLmvV974uoxenehtXj+buOGZqRfNwwO k3vg8bGpyW5U8nb7hWh/T52JU9O+3y60bJoNgQQhZM72+8Ebn1o01LlpvInyLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790764893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKicLv2QsE6460O2CaDTg46b2zyRAnwMaXBqzw/ZGq4=; b=KSTuRsJqrsFSIVYFUhM2L4Omo7HhuP4tI2wPDq7rIRuS+ycBiUgsJH/fyQm1ZtYUEAuqJF cTW5UtJHPYszlyinIpcS/ZJfF77GeMPxxuyvfs4soNOZEa77zd1Cx7ZHsAeAChqom8x2AS bTLuMR1NU7qWcMnM+0j5uOGBZ35vBOpDzhRP9DxVnA1qprLOS8w2JmkhO7FzYl4yWI2fdN UTbcL7Kx6kFP7o9PHIFlPlG7mmHqCSujYezmaAsUaUHlEJHwURv+I/qs2tR82nbDIL/qPj h06N1CUR7HvHiTz5L3Y+LKehMDatLX76IzLNh8k2PSgWswYiMKfkvVk+dtF8Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvs6N5gsmzjNf for ; Wed, 30 Sep 2026 10:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a962 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 10:41:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Sumit Saxena Subject: git: 6f12a32d1e8b - stable/15 - bnxt: Fix build / load error for bnxt(4) in kernels without PCI_IOV 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: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6f12a32d1e8b76f9455730695a20cef47d8d7b52 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 10:41:32 +0000 Message-Id: <6abce75c.3a962.21516503@gitrepo.freebsd.org> The branch stable/15 has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=6f12a32d1e8b76f9455730695a20cef47d8d7b52 commit 6f12a32d1e8b76f9455730695a20cef47d8d7b52 Author: Andrew Gallatin AuthorDate: 2026-05-29 12:52:44 +0000 Commit: Sumit Saxena CommitDate: 2026-09-30 10:39:31 +0000 bnxt: Fix build / load error for bnxt(4) in kernels without PCI_IOV This change removes the hard-forcing of PCI_IOV and adds shims to allow the driver to compile and work when the kernel is missing PCI_IOV support. Fixes: 7c450d1127c7 Reviewed by: sumit.saxena_broadcom.com Differential Revision: https://reviews.freebsd.org/D57300 Sponsored by: Netflix (cherry picked from commit 3118f1b99f23431235c202d9aadbe3d183bcc259) --- sys/dev/bnxt/bnxt_en/bnxt_sriov.c | 39 +++++++++++++++++++++++++++++++++++++++ sys/dev/bnxt/bnxt_en/bnxt_sriov.h | 4 ---- sys/dev/bnxt/bnxt_en/if_bnxt.c | 2 -- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_sriov.c b/sys/dev/bnxt/bnxt_en/bnxt_sriov.c index 270c18165fb7..071feffbadfd 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_sriov.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_sriov.c @@ -7,6 +7,8 @@ #include "bnxt_hwrm.h" #include "bnxt_sriov.h" +#ifdef PCI_IOV + static int bnxt_set_vf_admin_mac(struct bnxt_softc *softc, struct bnxt_vf_info *vf, const uint8_t *mac) @@ -973,6 +975,43 @@ void bnxt_sriov_attach(struct bnxt_softc *softc) device_printf(dev, "Failed to initialize SR-IOV (error=%d)\n", rc); } +#else + +void +bnxt_sriov_attach(struct bnxt_softc *softc __unused) +{ +} + +int +bnxt_cfg_hw_sriov(struct bnxt_softc *softc __unused, + uint16_t *num_vfs __unused, bool reset __unused) +{ + return (0); +} + +int +bnxt_approve_mac(struct bnxt_softc *sc __unused) +{ + return (0); +} + +void +bnxt_hwrm_exec_fwd_req(struct bnxt_softc *softc __unused) +{ +} + +bool +bnxt_promisc_ok(struct bnxt_softc *softc __unused) +{ + return (true); +} + +void +bnxt_update_vf_mac(struct bnxt_softc *sc __unused) +{ +} +#endif + void bnxt_reenable_sriov(struct bnxt_softc *bp) { if (BNXT_PF(bp)) { diff --git a/sys/dev/bnxt/bnxt_en/bnxt_sriov.h b/sys/dev/bnxt/bnxt_en/bnxt_sriov.h index 176f54af0aa8..24ea11f29b83 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_sriov.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_sriov.h @@ -8,10 +8,6 @@ #include "opt_global.h" #include "bnxt.h" -#ifndef PCI_IOV -#define PCI_IOV 1 -#endif - /* macro definations */ #define BNXT_MAX_VFS 4 diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index e43f1a3db63e..08c77ac73fa1 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -2887,11 +2887,9 @@ bnxt_attach_post(if_ctx_t ctx) bnxt_dcb_init(softc); bnxt_rdma_aux_device_init(softc); -#if PCI_IOV /* SR-IOV attach */ if (BNXT_PF(softc) && BNXT_CHIP_P5_PLUS(softc)) bnxt_sriov_attach(softc); -#endif failed: return rc;