From nobody Thu Oct 29 23:37:39 2026 X-Original-To: dev-commits-src-branches@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 4jG0yX0nNQz6xr9k for ; Thu, 29 Oct 2026 23:37:40 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jG0yW43bpz4tGW for ; Thu, 29 Oct 2026 23:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793317059; 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=BcqZLTyeN76AUmiVAkJ8M6XAgz5Oy2lgpWZcGqU1ukg=; b=NevP7EhV/pWjauwC1RRY9bEKZE9if6wG5AtJhlC27YWkQ5oGjFszKNNSDRUoFodQbDSK1F jITeK5B6EcWjmFfe9ju0T2uJcazUs9fKJ7Tu74KWuvpOzIgKBHCv37XHG60IF/Jy4bWBjJ BJy5SCxns99iJDi5ZSauMhydmmBXcbbqmO1B+dBanU/2uD5CowVE1PO6CQUKyWj+SDPrgd uMgCkMGWnVWMhDXgeCeOWBKmLtZWjNmpEK0dV1LH+aOK2AoU4kU7b0tbM8TmeRislkEDVt rcFddzKW+U2X+yH1yOgFy9FOCQr56LvDSWrND9fEie/x4aQGb2VAWpVITA6ppg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793317059; b=vXXqi7UqsIr6/mLJCbqUnjQ0l+3oktSn+d0uzwXZNoYsDszNwYF4yY7/pRp7jNx4L44TVL R4Z1X2mL486UbImJ9i2zFOFurYsq6b32LRi3Bbr8NChcCOqwl0qhdTFAi74qA7iweKOZd6 eEvYA+rPOHC5VKze80bbIBmxPYXoHSaIMyoWUsL+bcfVhLSjxwh5hcVJ+anen8WOhC+Mv0 aQFLLhqXezwXr+vr8GDP9kdAsUEzqo0MGt82b49J3vfbite4HBxzSVmhNIjQ8ZvRNa2Otr SJ9J3MN9CrGjaokn6Fgw0e6bWptODNIKC7phH9E6WfsNiDtch2Q5Dc40vMFX2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793317059; 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=BcqZLTyeN76AUmiVAkJ8M6XAgz5Oy2lgpWZcGqU1ukg=; b=qyl7VxAn6S4UsCDk4ggHic7BwWE3dLejlJNrxnmgU3ZdK9x2TAtjH553fHUfvhLUlOVlc/ 1/6NvaGY7Ypz9n3fURilKv3vWxT2iFA0Wz8rRxmai6GpC57XrbNKeC1+EjLW1sA7ImU4jL q9KPVTU2ffaYjERATfU+Wu7tgvz1Mn+Dt+t8FFOACJgJceKrU90A+U77ikLo5bLrqXOvU3 8njYhFrfm4YUP4omyLw8QK/ciabZqu84OYfmAlNEDua4pomcG+B8J57Z+9mVF3xw9I8Gcu D5MsqpuIIsL3bTW0Kw+kOqFWTQS+eedcxSlSdn5Od9Zz3qb19l7Atz2IrhxdWQ== 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 4jG0yW3Sbvz11kT for ; Thu, 29 Oct 2026 23:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 23:37:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sumit Saxena From: Kevin Bowling Subject: git: 3e6bee2441f0 - stable/15 - if_bnxt: don't reserve RoCE MSI-x on chips that don't support RoCE List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: 3e6bee2441f025658176c0b34661bce3a5dace93 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 23:37:39 +0000 Message-Id: <6ae3d8c3.3ca85.301d22d2@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6bee2441f025658176c0b34661bce3a5dace93 commit 3e6bee2441f025658176c0b34661bce3a5dace93 Author: Sumit Saxena AuthorDate: 2026-08-21 11:33:48 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 23:25:52 +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 Sponsored by: Broadcom Inc. Differential Revision: https://reviews.freebsd.org/D59091 (cherry picked from commit 15187b27c895e82d153dd1de5324076692023e70) --- 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 0c32ff1d661a..776da70a6d1c 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -458,6 +458,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) { @@ -466,7 +484,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;