From nobody Fri Aug 14 21:47:58 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 4hMG776Th7z6npvc for ; Fri, 14 Aug 2026 21:48:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hMG775vpwz3f05 for ; Fri, 14 Aug 2026 21:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786744083; 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=Ki8b9iKZKcB4+LY6+9bP41PnEyhY/zMGBviwCsRtrss=; b=j/bOrqqV8/DAiBceU5wS8rf9YubtXGn9OWyg1iYh7hNPdv+C6j9qGQBGgHogePr5oZP+qk kmcA5c3L5tTxl/f04S29kdj4VFOMZ7jT0Au1U5o945tB7sMdDKh8gLrVmagrZUCxH7afX+ PjJqNm8WMgFOhJvg9koF3VMiR4WlA2TciJ7JGFyzcRz0Gw78313Us5i0n1J6TIdXG4udJz 5Y0beF1MMXL8f1EFJBxsggNDlyS0PE8pV23RVPkQLQ5VD/Hef/WBbmkp1hWO8AfVhg7Vyt H9Y9Ont9vR2eC1IE1FFip3oMlt0jxqtWJz+I756zxhVfoHOqbWLmSIzBHYjkeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786744083; a=rsa-sha256; cv=none; b=nt+qupXcvWSjGUPY57RJpaLK3T4f27qdB9AB/bi52VkipSXWFl2sbtJnMSNnu/I+FzT2tZ iYSsj4E2v/lzDmEIVbOptZb9nyE8skejSASoIVOIdf0GhuKCJrpoUoPf5bCAspPB9xIRse 6vANZrnMWVWUv3OPldg2EAPwe4K0lBTI2X45yvFkL4jGFza5btBN3jhn7yGGY85bYdBO0a UPSsQ7FoH5kyX9TKsHO7vyQgAE5Oifu5j6DmlLdbpmHagivCYFuIbfloh9IKdj0hUE/IRy EhatE/CWA2nxytGcYj17lIUd9Ec/0gOidPvdSmZ2HQh6j4OKI0nvmQp6B3/QeQ== 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=1786744083; 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=Ki8b9iKZKcB4+LY6+9bP41PnEyhY/zMGBviwCsRtrss=; b=woJnIuwjrkC17/gajJJUpuWyxFulc/ybNkx4jYrmowhXhl5//KuYYvNOh6kiM097DBtCa8 yW0cO0vERCmBGKkizt24BMQdwZW2nWMqAZGW9Gx1uYcV7Him82g5Zo0okx7768zwPWItSw gMeQSJGw4WA0NzUj5Nk8HyevLaZBWCsYZEzENmPp3HNGSSfc8A3WDFjJtiJJp8bPcWCpNv El3w1TZxpGEWjbWeah3XoHrluRiYVc7isihajniM0YqKqlntryeHl/KftQeBq2+T9av/fe OUk8BEX//EC3QpGMf8aYjfF5cWueQN3BSMZx5aFwuaXOkZWjod2vJ3LOThWctg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hMG7744H2zxb for ; Fri, 14 Aug 2026 21:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c70d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 14 Aug 2026 21:47:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 57293f4541cd - main - pci: Do not reconcile MPS across PCI domains 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/main X-Git-Reftype: branch X-Git-Commit: 57293f4541cdea8e4158f751a4439f69b3ec1711 Auto-Submitted: auto-generated Date: Fri, 14 Aug 2026 21:47:58 +0000 Message-Id: <6a7f8d0e.1c70d.2c3a2ee5@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=57293f4541cdea8e4158f751a4439f69b3ec1711 commit 57293f4541cdea8e4158f751a4439f69b3ec1711 Author: Kevin Bowling AuthorDate: 2026-08-14 05:16:41 +0000 Commit: Kevin Bowling CommitDate: 2026-08-14 21:47:50 +0000 pci: Do not reconcile MPS across PCI domains A PCI function can provide a host bridge into a synthetic PCI domain. Intel VMD does this: the host facing VMD function remains in its original domain while the hidden Root Ports and endpoints appear in a separate domain. The VMD function's Device Control does not describe an upstream link in that synthetic hierarchy. The hierarchy wide cold pass incorrectly used the VMD function's MPS to reprogram the hidden ports and their endpoints. Stop both cold reconciliation and runtime path walks at a PCI domain boundary. The real Root Ports within the VMD domain continue to reconcile their endpoints normally. Reviewed by: imp Tested by: Michael Butler Fixes: 8e9fe9996a1f ("pci: Reconcile MPS before attaching PCIe devices") MFC after: 6 days Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D58837 --- sys/dev/pci/pci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 83ea487bdaa5..34ee261604a2 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -4488,6 +4488,13 @@ pcie_path_mps(device_t dev, uint16_t *mpsp) pcib = device_get_parent(bus); if (pcib == NULL || !is_pci_device(pcib)) break; + /* + * A PCI function may expose a host bridge for a synthetic PCI + * domain. Its Device Control belongs to the parent domain and + * does not describe an upstream link in the synthetic hierarchy. + */ + if (pci_get_domain(pcib) != pci_get_domain(dev)) + break; dinfo = device_get_ivars(pcib); if (dinfo->cfg.pcie.pcie_location != 0) { mps = pcie_read_config(pcib, PCIER_DEVICE_CTL, 2) & @@ -4705,6 +4712,13 @@ pcie_reconcile_link_mps(device_t bus) pcib = device_get_parent(bus); if (!is_pci_device(pcib)) return; + /* + * A PCI function may provide a host bridge into a separate domain, + * as Intel VMD does. Do not treat the function's host-facing PCIe + * Device Control as the upstream end of a link in the child domain. + */ + if (pci_get_domain(pcib) != pcib_get_domain(bus)) + return; upinfo = device_get_ivars(pcib); if (upinfo->cfg.pcie.pcie_location == 0) return;