bhyve: remove a hack to map all 8G BARs 1:1

[kib]

Summary

For now I also removed pci_emul_alloc_pbar(), but it will be re-instantiated later with different set of args.

Suggested by: grehan

head/usr.sbin/bhyve/pci_emul.h

 
 typedef void (*pci_lintr_cb)(int b, int s, int pin, int pirq_pin,
     int ioapic_irq, void *arg);
 
 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,
             uint32_t val, uint8_t capoff, int capid);
 void        pci_emul_cmd_changed(struct pci_devinst *pi, uint16_t old);
 void        pci_generate_msi(struct pci_devinst *pi, int msgnum);
 void        pci_generate_msix(struct pci_devinst *pi, int msgnum);
 void        pci_lintr_assert(struct pci_devinst *pi);

head/usr.sbin/bhyve/pci_emul.c

pci_emul_alloc_resource(uint64_t *baseptr, uint64_t limit, uint64_t size,
         if (base + size <= limit) {
                 *addr = base;
                 *baseptr = base + size;
                 return (0);
         } else
                 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.
  */
 static void
 modify_bar_registration(struct pci_devinst *pi, int idx, int registration)
 {
         int error;
default:
                 assert(0);
         }
 
         if (decode)
                 register_bar(pi, idx);
 }
 
 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;
         uint16_t cmd, enbit;
 
         assert(idx >= 0 && idx <= PCI_BARMAX);
 
         if ((size & (size - 1)) != 0)
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
                  * 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;
                         limit = pci_emul_memlim64;
                         mask = PCIM_BAR_MEM_BASE;
                         lobits = PCIM_BAR_MEM_SPACE | PCIM_BAR_MEM_64 |
                                  PCIM_BAR_MEM_PREFETCH;
                 } else {
                         baseptr = &pci_emul_membase32;
                         limit = PCI_EMUL_MEMLIMIT32;
                         mask = PCIM_BAR_MEM_BASE;

head/usr.sbin/bhyve/pci_passthru.c

for (i = 0; i <= PCI_BARMAX; i++) {
                 }
 
                 /* Cache information about the "real" BAR */
                 sc->psc_bar[i].type = bartype;
                 sc->psc_bar[i].size = size;
                 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);
 
                 /* The MSI-X table needs special handling */
                 if (i == pci_msix_table_bar(pi)) {
                         error = init_msix_table(ctx, sc, base);
                         if (error) 
                                 return (-1);