Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / pci.c

diff --git a/hypervisor/pci.c b/hypervisor/pci.c
index 2dd4ccaf94a6ebfa34b901f84f92968b43382391..12424666b5c874a09513e1b8171fabecda24ef90 100644 (file)
--- a/hypervisor/pci.c
+++ b/hypervisor/pci.c
@@ -360,25 +360,24 @@ int pci_init(void)
 {
        int err;
 
-       err = pci_cell_init(&root_cell);
-       if (err)
-               return err;
-
        mmcfg_start = system_config->platform_info.x86.mmconfig_base;
-       if (mmcfg_start == 0)
-               return 0;
+       if (mmcfg_start != 0) {
+               end_bus = system_config->platform_info.x86.mmconfig_end_bus;
+               mmcfg_size = (end_bus + 1) * 256 * 4096;
 
-       end_bus = system_config->platform_info.x86.mmconfig_end_bus;
-       mmcfg_size = (end_bus + 1) * 256 * 4096;
+               pci_space = page_alloc(&remap_pool, mmcfg_size / PAGE_SIZE);
+               if (!pci_space)
+                       return trace_error(-ENOMEM);
 
-       pci_space = page_alloc(&remap_pool, mmcfg_size / PAGE_SIZE);
-       if (!pci_space)
-               return trace_error(-ENOMEM);
+               err = paging_create(&hv_paging_structs, mmcfg_start,
+                                   mmcfg_size, (unsigned long)pci_space,
+                                   PAGE_DEFAULT_FLAGS | PAGE_FLAG_DEVICE,
+                                   PAGING_NON_COHERENT);
+               if (err)
+                       return err;
+       }
 
-       return paging_create(&hv_paging_structs, mmcfg_start, mmcfg_size,
-                            (unsigned long)pci_space,
-                            PAGE_DEFAULT_FLAGS | PAGE_FLAG_DEVICE,
-                            PAGING_NON_COHERENT);
+       return pci_cell_init(&root_cell);
 }
 
 static enum mmio_result pci_msix_access_handler(void *arg,
@@ -459,7 +458,7 @@ static enum mmio_result pci_mmconfig_access_handler(void *arg,
 
 invalid_access:
        panic_printk("FATAL: Invalid PCI MMCONFIG write, device %02x:%02x.%x, "
-                    "reg: %\n", PCI_BDF_PARAMS(mmio->address >> 12),
+                    "reg: %x\n", PCI_BDF_PARAMS(mmio->address >> 12),
                     reg_addr);
        return MMIO_ERROR;
 
@@ -662,6 +661,9 @@ int pci_cell_init(struct cell *cell)
                mmio_region_register(cell, mmcfg_start, mmcfg_size,
                                     pci_mmconfig_access_handler, NULL);
 
+       if (cell->config->num_pci_devices == 0)
+               return 0;
+
        cell->pci_devices = page_alloc(&mem_pool, devlist_pages);
        if (!cell->pci_devices)
                return -ENOMEM;