@@ -645,7 +645,8 @@ static int acpi_pci_root_start(struct acpi_device *device)
driver->add(root);
/* need to after hot-added ioapic is registered */
- pci_enable_bridges(root->bus);
+ if (root->hot_added)
+ pci_enable_bridges(root->bus);
pci_bus_add_devices(root->bus);
mutex_unlock(&acpi_pci_root_lock);
@@ -86,6 +86,7 @@ static void acpi_root_configure_bridge(struct acpi_device *device)
pcibios_resource_survey_bus(root->bus);
pci_assign_unassigned_bus_resources(root->bus);
+ root->hot_added = true;
}
static void handle_root_bridge_insertion(acpi_handle handle)
@@ -406,6 +406,7 @@ struct acpi_pci_root {
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
+ bool hot_added;
phys_addr_t mcfg_addr;
};
Pre-installed will be handled later, need to skip the one only for hot-added roots. Otherwise will get anonying failing message about can not reserve, irq ... Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/acpi/pci_root.c | 3 ++- drivers/acpi/pci_root_hp.c | 1 + include/acpi/acpi_bus.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)