From nobody Fri Oct 09 10:13:04 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 4j1N3N6c61z6vRdP for ; Fri, 09 Oct 2026 10:13:04 +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 4j1N3N4KzMz4YPr for ; Fri, 09 Oct 2026 10:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791540784; 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=W/9JW59642NVtCsaoPolBERCudWtXmYrJG2toKqTOww=; b=SH2G/oJnJTbuvPEhfkQibzQT7eEz/e3fcZNJOAMa+8di7y8VStq2UGD3En5E6DbVmsBwhv FBqfiCdThFH6TtO7ZU/Hmp/9ZJFYETuWVLhKStMG/f46ojHW1WV9jexOLSFYd8s+Y8AXju 13wKkEN9MHlLBvqkyVjFkUWv6ih9dXqojrJVHNO0w6672MbywjQG5PlA2axIHy5KuKvjl9 mFT/4hwHA0+avz/Ilql/vzdCwnrAOdsem89OX7pBeRNSNFCh1IB3kQCkwDzLm+iw+BciXp 0WgbmkTKEvbIz6KR5uRutasBYoBIAdzeSJa6C/EXIt22DyXWRb8MrdLQLx/hSQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791540784; b=fpAr6kjHDUjjjaBw64K/dCt26NDKbza0I7OB3GeMH4Rug/E5yIG1sMvoHiBy2GEPphAlDr K5e/Wd9J0t1Klm1gOkOC7RBtQTiPxcX8hrpvVFkkupIlt9TApRD+u+EI2lFNPI+XKTYQNU rjkn1YCZzCMQ+pUSRwQjbQIiuUBw0j19N2iP6kUr0BiNAeDKS/TjhcvW+wzGHHTuIBUneu 2A6KoWm5AsrLoh0USX3kbXqb3VnX1MbnIx8/YPEL/Xt+rJFfG2XPzrs+yR2cxQMfbF+bWn aFypfmA7KxBEbIPNraPf7ME9I1y+iH1Oo6gLkoJBxhgTeEDLtZzr739Bfcn6PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791540784; 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=W/9JW59642NVtCsaoPolBERCudWtXmYrJG2toKqTOww=; b=WgOLWU5GCmDEXuDjsKIkE/5fQfvI9UZRqrOY4+14dWmugGFnF6SNCJl6dWBPMCXXCRrqaV pGPdYwWlnLMQsvhUt5vqmijHzFwBLCAmG2MBwb/POMiXeGcpGgBGBWjRvpR6L1WkNnHHZk 0mTepQPblHlaqRCulJYOBLr6DbGlZvhi3LH4rd6N9KCI+ppZocpg6Cs9gO3ulnPjvgtD70 rUQ2MQXuPs3VSogwv1IJjfQExlIyA6brnFzEFyo/mGY8etyfPWdQWQl4Hvl0zuqCNbY47n FD7JXBPGWRIjUPZW46iZg2eoUdPbOUtaivP1fI0XZab+qwPv4uTzQdPuyD7M1w== 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 4j1N3N3Fm3z1LJ6 for ; Fri, 09 Oct 2026 10:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 10:13:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sumit Saxena From: Sumit Saxena Subject: git: 15187b27c895 - main - if_bnxt: don't reserve RoCE MSI-x on chips that don't support RoCE 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: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15187b27c895e82d153dd1de5324076692023e70 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 10:13:04 +0000 Message-Id: <6ac8be30.42d13.67c3a30d@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=15187b27c895e82d153dd1de5324076692023e70 commit 15187b27c895e82d153dd1de5324076692023e70 Author: Sumit Saxena AuthorDate: 2026-08-21 11:33:48 +0000 Commit: Sumit Saxena CommitDate: 2026-10-09 08:24:46 +0000 if_bnxt: don't reserve RoCE MSI-x on chips that don't support RoCE RoCE is only supported on Thor and onwards chips. bnxt_init_sctx_variants() unconditionally set isc_admin_intrcnt to BNXT_ROCE_IRQ_COUNT for every PF device, stealing 9 MSI-x vectors from older, non-RoCE-capable chips that will never use them. Gate the reservation on the device ID: RoCE-capable chips keep BNXT_ROCE_IRQ_COUNT, other chips fall back to 1, the baseline isc_admin_intrcnt value used before RoCE support (commit 050d28e13cde) repurposed it for RoCE MSI-x on every device. Reviewed by: gallatin MFC after: 2 weeks Sponsored by: Broadcom Inc. Differential Revision: https://reviews.freebsd.org/D59091 --- sys/dev/bnxt/bnxt_en/if_bnxt.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index 62490e86baeb..759eeff63607 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -450,6 +450,24 @@ static struct if_shared_ctx bnxt_sctx_pf_init; static struct if_shared_ctx bnxt_sctx_vf_init; static bool sctx_initialized = false; +static inline bool +bnxt_device_supports_roce(uint16_t device_id) +{ + switch (device_id) { + case BCM57508: + case BCM57504: + case BCM57504_NPAR: + case BCM57502: + case BCM57601: + case BCM57602: + case BCM57604: + case BCM57608: + return true; + default: + return false; + } +} + static inline void bnxt_init_sctx_variants(uint16_t device_id) { @@ -458,7 +476,8 @@ bnxt_init_sctx_variants(uint16_t device_id) else bnxt_sctx_pf_init = bnxt_sctx_template; - bnxt_sctx_pf_init.isc_admin_intrcnt = BNXT_ROCE_IRQ_COUNT; + bnxt_sctx_pf_init.isc_admin_intrcnt = bnxt_device_supports_roce(device_id) ? + BNXT_ROCE_IRQ_COUNT : 1; if (device_id == BCM57608) bnxt_sctx_pf_init.isc_admin_intrcnt += BNXT_MAX_MPC;