bhyve: remove a hack to map all 8G BARs 1:1
Suggested and reviewed by: grehan Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D27186
This commit is contained in:
parent
0b8e170d95
commit
038f5c7bfe
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=367613
@ -454,14 +454,6 @@ pci_emul_alloc_resource(uint64_t *baseptr, uint64_t limit, uint64_t size,
|
|||||||
return (-1);
|
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 (or unregister) the MMIO or I/O region associated with the BAR
|
||||||
* register 'idx' of an emulated pci device.
|
* register 'idx' of an emulated pci device.
|
||||||
@ -586,8 +578,8 @@ update_bar_address(struct pci_devinst *pi, uint64_t addr, int idx, int type)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
pci_emul_alloc_pbar(struct pci_devinst *pdi, int idx, uint64_t hostbase,
|
pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type,
|
||||||
enum pcibar_type type, uint64_t size)
|
uint64_t size)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
uint64_t *baseptr, limit, addr, mask, lobits, bar;
|
uint64_t *baseptr, limit, addr, mask, lobits, bar;
|
||||||
@ -628,12 +620,6 @@ pci_emul_alloc_pbar(struct pci_devinst *pdi, int idx, uint64_t hostbase,
|
|||||||
* number (128MB currently).
|
* number (128MB currently).
|
||||||
*/
|
*/
|
||||||
if (size > 128 * 1024 * 1024) {
|
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;
|
limit = pci_emul_memlim64;
|
||||||
mask = PCIM_BAR_MEM_BASE;
|
mask = PCIM_BAR_MEM_BASE;
|
||||||
|
@ -221,8 +221,6 @@ int init_pci(struct vmctx *ctx);
|
|||||||
void pci_callback(void);
|
void pci_callback(void);
|
||||||
int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx,
|
int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx,
|
||||||
enum pcibar_type type, uint64_t size);
|
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_msicap(struct pci_devinst *pi, int msgnum);
|
||||||
int pci_emul_add_pciecap(struct pci_devinst *pi, int pcie_device_type);
|
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,
|
void pci_emul_capwrite(struct pci_devinst *pi, int offset, int bytes,
|
||||||
|
@ -583,7 +583,7 @@ cfginitbar(struct vmctx *ctx, struct passthru_softc *sc)
|
|||||||
sc->psc_bar[i].addr = base;
|
sc->psc_bar[i].addr = base;
|
||||||
|
|
||||||
/* Allocate the BAR in the guest I/O or MMIO space */
|
/* 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)
|
if (error)
|
||||||
return (-1);
|
return (-1);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user