svn commit: r368051 - stable/12/usr.sbin/bhyve
Konstantin Belousov
kib at FreeBSD.org
Thu Nov 26 07:31:31 UTC 2020
Author: kib
Date: Thu Nov 26 07:31:30 2020
New Revision: 368051
URL: https://svnweb.freebsd.org/changeset/base/368051
Log:
MFC r367613:
bhyve: remove a hack to map all 8G BARs 1:1
Modified:
stable/12/usr.sbin/bhyve/pci_emul.c
stable/12/usr.sbin/bhyve/pci_emul.h
stable/12/usr.sbin/bhyve/pci_passthru.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/bhyve/pci_emul.c
==============================================================================
--- stable/12/usr.sbin/bhyve/pci_emul.c Thu Nov 26 07:30:29 2020 (r368050)
+++ stable/12/usr.sbin/bhyve/pci_emul.c Thu Nov 26 07:31:30 2020 (r368051)
@@ -453,14 +453,6 @@ pci_emul_alloc_resource(uint64_t *baseptr, uint64_t li
return (-1);
}
-int
-pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type,
- uint64_t size)
-{
-
- return (pci_emul_alloc_pbar(pdi, idx, 0, type, size));
-}
-
/*
* Register (or unregister) the MMIO or I/O region associated with the BAR
* register 'idx' of an emulated pci device.
@@ -585,8 +577,8 @@ update_bar_address(struct pci_devinst *pi, uint64_t ad
}
int
-pci_emul_alloc_pbar(struct pci_devinst *pdi, int idx, uint64_t hostbase,
- enum pcibar_type type, uint64_t size)
+pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type,
+ uint64_t size)
{
int error;
uint64_t *baseptr, limit, addr, mask, lobits, bar;
@@ -627,13 +619,7 @@ pci_emul_alloc_pbar(struct pci_devinst *pdi, int idx,
* number (128MB currently).
*/
if (size > 128 * 1024 * 1024) {
- /*
- * XXX special case for device requiring peer-peer DMA
- */
- if (size == 0x100000000UL)
- baseptr = &hostbase;
- else
- baseptr = &pci_emul_membase64;
+ baseptr = &pci_emul_membase64;
limit = pci_emul_memlim64;
mask = PCIM_BAR_MEM_BASE;
lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_64 |
Modified: stable/12/usr.sbin/bhyve/pci_emul.h
==============================================================================
--- stable/12/usr.sbin/bhyve/pci_emul.h Thu Nov 26 07:30:29 2020 (r368050)
+++ stable/12/usr.sbin/bhyve/pci_emul.h Thu Nov 26 07:31:30 2020 (r368051)
@@ -215,8 +215,6 @@ int init_pci(struct vmctx *ctx);
void pci_callback(void);
int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx,
enum pcibar_type type, uint64_t size);
-int pci_emul_alloc_pbar(struct pci_devinst *pdi, int idx,
- uint64_t hostbase, enum pcibar_type type, uint64_t size);
int pci_emul_add_msicap(struct pci_devinst *pi, int msgnum);
int pci_emul_add_pciecap(struct pci_devinst *pi, int pcie_device_type);
void pci_emul_capwrite(struct pci_devinst *pi, int offset, int bytes,
Modified: stable/12/usr.sbin/bhyve/pci_passthru.c
==============================================================================
--- stable/12/usr.sbin/bhyve/pci_passthru.c Thu Nov 26 07:30:29 2020 (r368050)
+++ stable/12/usr.sbin/bhyve/pci_passthru.c Thu Nov 26 07:31:30 2020 (r368051)
@@ -583,7 +583,7 @@ cfginitbar(struct vmctx *ctx, struct passthru_softc *s
sc->psc_bar[i].addr = base;
/* Allocate the BAR in the guest I/O or MMIO space */
- error = pci_emul_alloc_pbar(pi, i, base, bartype, size);
+ error = pci_emul_alloc_bar(pi, i, bartype, size);
if (error)
return (-1);
More information about the svn-src-stable-12
mailing list