diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:17:15 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:17:15 -0700 |
| commit | eeba13b1bbc089398daf130a97cc279521b1f15b (patch) | |
| tree | 85c8eaeeb93432584988d81771b663a9b54a3d75 | |
| parent | 376f693d7af6cd44e313686a3cf3593d72239efb (diff) | |
| download | linux-yinghai-eeba13b1bbc089398daf130a97cc279521b1f15b.tar.gz | |
ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root
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>
| -rw-r--r-- | drivers/acpi/pci_root.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/pci_root_hp.c | 1 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 670511fde29354..6151d83186d205 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -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); diff --git a/drivers/acpi/pci_root_hp.c b/drivers/acpi/pci_root_hp.c index e573298d045bdf..1f60533cc6bd3f 100644 --- a/drivers/acpi/pci_root_hp.c +++ b/drivers/acpi/pci_root_hp.c @@ -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) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index bde976ee068d38..47de196ce54f0e 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -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; }; |