Page MenuHomeFreeBSD
Files F162369168

D27186.id79451.diff
No OneTemporary
Actions

D27186.id79451.diff
View Options

Index: usr.sbin/bhyve/pci_emul.h
===================================================================
--- usr.sbin/bhyve/pci_emul.h
+++ usr.sbin/bhyve/pci_emul.h
@@ -221,8 +221,6 @@
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,
Index: usr.sbin/bhyve/pci_emul.c
===================================================================
--- usr.sbin/bhyve/pci_emul.c
+++ usr.sbin/bhyve/pci_emul.c
@@ -454,14 +454,6 @@
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.
@@ -586,8 +578,8 @@
}
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;
@@ -628,13 +620,7 @@
* 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 |
Index: usr.sbin/bhyve/pci_passthru.c
===================================================================
--- usr.sbin/bhyve/pci_passthru.c
+++ usr.sbin/bhyve/pci_passthru.c
@@ -583,7 +583,7 @@
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);

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 13, 1:59 PM (6 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35034799
Default Alt Text
D27186.id79451.diff (2 KB)

Event Timeline