From nobody Thu Oct 08 20:44:08 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 4j12612RNDz4n2t4 for ; Thu, 08 Oct 2026 20:44:09 +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 4j12610DPfz4c5x for ; Thu, 08 Oct 2026 20:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492249; 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=zc0Yj27+E3mxuGXPbnTX8jlU1bJca9vzIsVjsolqXfo=; b=DOzOF2WLdHf97SZ44s2X/CKCmsw1/dPxFF6p8/SStu2pUA92uF7u6h0KP0577PFCmie6uK otT4oSDAEYQo+I7VbV3qUB7xFyJsNFTqHaa5DC+PfwdDwEqzDsED1Lzm1Dq1hc0RL03JW2 R2myO2y9J9SdOp0nseddgAFDMTri4COCoBy8G9UJQCx3SlYglOobJjTk3wedHCdm2g3cXE C2ipWdrAB88KIljktJ88GK449a/IdqE4HPfoUO6s19DLWxMJ3bMgp0vMf7IZnJJB32Dkmq gvG47H76h7SfkdA1/39JnNYWi6ZCq1SlGp9/kIz7z8xnuYazYkyvs568qf64tQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492249; b=I7SK9+1Zom+Hg6OGbYjWBuKDeIUlwBYUOuCa6HUQmn9XOt9T7HU7MNaaZM0U7Z8fbFRqTm C80HsOLodUZW4A92jc8rB7WzEYJ6qQ7aMDCO/sSTIcZMcbqKx+gVPpgNNe6uCu5GgsPqCt SVzjlkY61bLBbUHzTLchdqMhzgUH4eoqMTl7u26oAuVt/93NVtKHDYyz0L4bb6b9WBWS4X NfUQoI2Y4bcSdwqyu7SYEQLA3J/pfGOY81naCp/SZxm/MfqaUnYnAMz2739/+8N3HXisg3 dAwkMWQN/Yje8V506aQRoPFZOALROctC6kEVz2oqwd6JSukcxjk4Jt58SDlg2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492249; 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=zc0Yj27+E3mxuGXPbnTX8jlU1bJca9vzIsVjsolqXfo=; b=DchGK2DS7X5l5DU4cYGEZNGbPyA6SlEw215o42fM7vcNMQO4DicsJvsjEoPg0Io0kszC32 71HMzaSSjbawxg7pM24wfdSgY9MSTuedDG8h6lhZhbYvJCZdu+LpRoXO32AbCWlwxk2bSA VXi/YDwxPHgWP515jgaSSDjbLiGm9fTPoDMPQtuguwPz+rNUlKTH1QrQIpo3S7hu2Bg6r7 0RKLXqoNTa/1m4h7Z+UbRCmLHfLyGRFxp2Ho7U0zJOHTV24KimHI7SiIIcZT6nY+yCLUGs vCtNsVMAkFSVDXC+tYfIH96vasWD9KalvxCHqQXD0UwX622tr3aieoyb3B/cxw== 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 4j12606Qx5zwTy for ; Thu, 08 Oct 2026 20:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3311e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e3aa820b05ef - stable/15 - bhyve: Refactor initial PCI BAR setup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: e3aa820b05ef0fa0deb8cefdcffce4f4de517fa4 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:08 +0000 Message-Id: <6ac80098.3311e.70b497b0@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3aa820b05ef0fa0deb8cefdcffce4f4de517fa4 commit e3aa820b05ef0fa0deb8cefdcffce4f4de517fa4 Author: John Baldwin AuthorDate: 2026-08-26 19:30:44 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:32 +0000 bhyve: Refactor initial PCI BAR setup Fully initialize BARs with an address of 0 in pci_emul_alloc_bar() instead of deferring some of that initialization to pci_emul_assign_bar(). Now, the latter is only used to allocate an initial address range for PCI BARs. Note that this means that the pci_passthru model now overrides the initial lobits after they are set removing the need for a workaround in pci_emul_assign_bar(). Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D58893 (cherry picked from commit b00bb87a614212a2bbb156288bfdd51b27bcb329) --- usr.sbin/bhyve/pci_emul.c | 116 +++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 53 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 7ef670240e2e..9170e0b6b93c 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -799,8 +799,22 @@ void pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type, uint64_t size) { - assert((type == PCIBAR_ROM) || (idx >= 0 && idx <= PCI_BARMAX)); - assert((type != PCIBAR_ROM) || (idx == PCI_ROM_IDX)); + uint64_t lobits; + + switch (type) { + case PCIBAR_ROM: + assert(idx == PCI_ROM_IDX); + break; + case PCIBAR_IO: + case PCIBAR_MEM32: + assert(idx >= 0 && idx <= PCI_BARMAX); + break; + case PCIBAR_MEM64: + assert(idx >= 0 && idx + 1 <= PCI_BARMAX); + break; + default: + assert(false); + } if ((size & (size - 1)) != 0) size = 1UL << flsl(size); /* round up to a power of 2 */ @@ -817,6 +831,41 @@ pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type, size = 16; } + switch (type) { + case PCIBAR_IO: + lobits = PCIM_BAR_IO_SPACE; + break; + case PCIBAR_MEM64: + lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_64; + break; + case PCIBAR_MEM32: + lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_32; + break; + case PCIBAR_ROM: + lobits = 0; + break; + default: + __assert_unreachable(); + } + + /* Initialize the BAR with an address of 0. */ + pdi->pi_bar[idx].type = type; + pdi->pi_bar[idx].size = size; + pdi->pi_bar[idx].addr = 0; + pdi->pi_bar[idx].lobits = lobits; + pci_set_cfgdata32(pdi, PCIR_BAR(idx), lobits); + if (type == PCIBAR_MEM64) { + pdi->pi_bar[idx + 1].type = PCIBAR_MEMHI64; + pci_set_cfgdata32(pdi, PCIR_BAR(idx + 1), 0); + } + + /* + * Don't enable or assign an address range for ROM BARs. They + * are not used in the non-boot ROM case. + */ + if (type == PCIBAR_ROM) + return; + /* * To reduce fragmentation of the MMIO space, we allocate the BARs by * size. Therefore, don't allocate the BAR yet. We create a list of all @@ -893,87 +942,49 @@ pci_emul_assign_bar(struct pci_devinst *const pdi, const int idx, const enum pcibar_type type, const uint64_t size) { int error; - uint64_t *baseptr, limit, addr, mask, lobits, bar; + uint64_t *baseptr, limit, addr, mask, bar; switch (type) { - case PCIBAR_NONE: - baseptr = NULL; - addr = mask = lobits = 0; - break; case PCIBAR_IO: baseptr = &pci_emul_iobase; limit = PCI_EMUL_IOLIMIT; mask = PCIM_BAR_IO_BASE; - lobits = PCIM_BAR_IO_SPACE; break; case PCIBAR_MEM64: /* * XXX * Some drivers do not work well if the 64-bit BAR is allocated * above 4GB. Allow for this by allocating small requests under - * 4GB unless then allocation size is larger than some arbitrary + * 4GB unless the allocation size is larger than some arbitrary * number (128MB currently). */ if (size > 128 * 1024 * 1024) { baseptr = &pci_emul_membase64; limit = pci_emul_memlim64; mask = PCIM_BAR_MEM_BASE; - lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_64; - } else { - baseptr = &pci_emul_membase32; - limit = PCI_EMUL_MEMLIMIT32; - mask = PCIM_BAR_MEM_BASE; - lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_64; + break; } - break; + /* FALLTHROUGH */ case PCIBAR_MEM32: baseptr = &pci_emul_membase32; limit = PCI_EMUL_MEMLIMIT32; mask = PCIM_BAR_MEM_BASE; - lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_32; - break; - case PCIBAR_ROM: - /* do not claim memory for ROM. OVMF will do it for us. */ - baseptr = NULL; - limit = 0; - mask = PCIM_BIOS_ADDR_MASK; - lobits = 0; break; default: - printf("pci_emul_alloc_base: invalid bar type %d\n", type); - assert(0); + __assert_unreachable(); } - if (baseptr != NULL) { - error = pci_emul_alloc_resource(baseptr, limit, size, &addr); - if (error != 0) - return (error); - } else { - addr = 0; - } + error = pci_emul_alloc_resource(baseptr, limit, size, &addr); + if (error != 0) + return (error); - pdi->pi_bar[idx].type = type; + /* Update the BAR address */ pdi->pi_bar[idx].addr = addr; - pdi->pi_bar[idx].size = size; - /* - * passthru devices are using same lobits as physical device they set - * this property - */ - if (pdi->pi_bar[idx].lobits != 0) { - lobits = pdi->pi_bar[idx].lobits; - } else { - pdi->pi_bar[idx].lobits = lobits; - } - /* Initialize the BAR register in config space */ - bar = (addr & mask) | lobits; + bar = (addr & mask) | pdi->pi_bar[idx].lobits; pci_set_cfgdata32(pdi, PCIR_BAR(idx), bar); - - if (type == PCIBAR_MEM64) { - assert(idx + 1 <= PCI_BARMAX); - pdi->pi_bar[idx + 1].type = PCIBAR_MEMHI64; + if (type == PCIBAR_MEM64) pci_set_cfgdata32(pdi, PCIR_BAR(idx + 1), bar >> 32); - } switch (type) { case PCIBAR_IO: @@ -982,12 +993,11 @@ pci_emul_assign_bar(struct pci_devinst *const pdi, const int idx, break; case PCIBAR_MEM32: case PCIBAR_MEM64: - case PCIBAR_MEMHI64: if (memen(pdi)) register_bar(pdi, idx); break; default: - break; + __assert_unreachable(); } return (0);