From nobody Fri Oct 09 00:20:54 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 4j16w670Myz6Z2KK for ; Fri, 09 Oct 2026 00:20:54 +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 4j16w614d4z4LrR for ; Fri, 09 Oct 2026 00:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505254; 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=1yGxJucmZyGHHeg/jhhn3SLWnWyLFclpXqBKnSmt/Pg=; b=q9k564/ZL5BkWymkcGlBRg7D7lLbVJcpOH65B9+zW9517ZTPLHsPfZ476lb2SB0FOtryC8 7vLPeM3SqK72Jn9t/ClFKzvsiYab08zPQ7hqzzUUp7yXzWUory12WUSuJG1VTpS71bdpDL okAvl/rLUwQGpqenQACEtdwKtNcGmRAMYiKxBpZ0BdqMFN0v3fTJHklf9jtqw9xZ9ECdHP mFS0HuEwatew/KJZ9hqjyNGBf+psX/rtvKa8tFTCu/LzYcYyGe4ObHyFA8JubYuu5+aGiK OenaNNvX4JZ1YDYPJCSR+caAEpHf70d1wQRZ0VmG8Bl9l7WmQ8CG1IBbKOa4XA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791505254; b=HfoQp4Rg1KhewjScPETjCtxchDf3n0quUdHDCdxalx7bF1XXd/6EtamgIPoW9xktyeTVMZ 0CjBM0y1gs8eC1lQ5iCCbQkDveZBw4y+e0+R7kluMt70YpDWsYN4wm3kXl4oZorxKeYhTw M6ZSSjKSVQRR6rHf8GO39Ccurmfxu3PDz1n4mK0Hv758kRUyf5FjaU5WqFBTgXGjmvEf2Z hGx4ltwcGn0pOKKHnzZlEmd5fiabhw7YrYmbycLn/IVUgT9y0Qpd/+MpsK8gLs7OA2QNWZ 6vZKkmTKyg+Xe2P2vyZ5Xc0C4UnNxPiKrvrD0zLC/VfbSzLRXRWDZyLzP7PK/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505254; 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=1yGxJucmZyGHHeg/jhhn3SLWnWyLFclpXqBKnSmt/Pg=; b=OPJO1qc+cVvNTDy4INMd3snzWqtVuFAVca/p6uKJCvVDczh2dM0+P+vVb01D+Ii+lmQm7T hp4W0tRUrV1gZMFyCQ5llKUuNpH75w3HXrDTIdtSoNTUHPPx2pbT7pyzJrddRUUCJ90woS TYOBhL2vR5WA4QKxVoo+W9/5L/WQrU+58XDECbtNA62A8bnAjmCug86xsi40ysSaek8laG iSc9QIW2at3QAUtvAm7WbrWHLmJnc1pazfJc09sVXfZtQot/ibaLMQEjxAsboOtiKrs+yi G6tNwO/N753NpdmVs3Vnt/U4w5+de0y72S/YbnZ3Op1/bO6WrKRj+dexZFt1Ow== 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 4j16w603SHz13Cr for ; Fri, 09 Oct 2026 00:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bb87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 00:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: John Baldwin Subject: git: 983f7f9f5089 - stable/14 - pcib: Only apply ARI translation to a bridge's own secondary bus 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 983f7f9f5089fd1f3a8dd29d6d46dddad2abe841 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 00:20:54 +0000 Message-Id: <6ac83366.1bb87.bb0cf2d@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=983f7f9f5089fd1f3a8dd29d6d46dddad2abe841 commit 983f7f9f5089fd1f3a8dd29d6d46dddad2abe841 Author: Osvaldo Janeri Filho AuthorDate: 2026-09-30 15:04:08 +0000 Commit: John Baldwin CommitDate: 2026-10-08 18:57:47 +0000 pcib: Only apply ARI translation to a bridge's own secondary bus ARI changes RID interpretation only for the device on a downstream port's secondary bus. pcib_xlate_ari() applied that translation to every config access through an ARI-enabled bridge, including cycles forwarded to a subordinate bus. A non-zero slot on a subordinate bus then panics an INVARIANTS kernel and is misrouted otherwise. Translate only when the access targets this bridge's secondary bus. Reviewed by: kib, jhb Fixes: 55d3ea1731d1 ("Add support for PCIe ARI") Sponsored by: AMD Differential Revision: https://reviews.freebsd.org/D60033 (cherry picked from commit 10409ee40baf593b810cd0140f3c2f0d737c1a65) --- sys/dev/pci/pci_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index eb48dab1f188..cd72b64c7bf7 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -2756,7 +2756,8 @@ pcib_xlate_ari(device_t pcib, int bus, int *slot, int *func) sc = device_get_softc(pcib); ari_func = *func; - if (sc->flags & PCIB_ENABLE_ARI) { + /* ARI applies only to this port's secondary bus. */ + if ((sc->flags & PCIB_ENABLE_ARI) && bus == sc->bus.sec) { KASSERT(*slot == 0, ("Non-zero slot number with ARI enabled!")); *slot = PCIE_ARI_SLOT(ari_func);