diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-10-30 16:31:32 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-03 18:20:38 -0400 |
commit | 62a08c5a3173c4462239804b959c0d29dc74493b (patch) | |
tree | a01315c7189520e4d729d37ad8a9370d5482dfd4 /drivers/acpi | |
parent | e164f658f209b85566732bd85c62009237be0909 (diff) |
PCI/ACPI: Assign unassigned resource for hot-added root bus
After we get hot-added IOAPIC registered.
pci_enable_bridges() will try to enable IOAPIC IRQ for PCI bridges.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/pci_root.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index bce469c0b48a..27adbfdffb0c 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -644,12 +644,19 @@ static int acpi_pci_root_start(struct acpi_device *device) | |||
644 | struct acpi_pci_root *root = acpi_driver_data(device); | 644 | struct acpi_pci_root *root = acpi_driver_data(device); |
645 | struct acpi_pci_driver *driver; | 645 | struct acpi_pci_driver *driver; |
646 | 646 | ||
647 | if (system_state != SYSTEM_BOOTING) | ||
648 | pci_assign_unassigned_bus_resources(root->bus); | ||
649 | |||
647 | mutex_lock(&acpi_pci_root_lock); | 650 | mutex_lock(&acpi_pci_root_lock); |
648 | list_for_each_entry(driver, &acpi_pci_drivers, node) | 651 | list_for_each_entry(driver, &acpi_pci_drivers, node) |
649 | if (driver->add) | 652 | if (driver->add) |
650 | driver->add(root); | 653 | driver->add(root); |
651 | mutex_unlock(&acpi_pci_root_lock); | 654 | mutex_unlock(&acpi_pci_root_lock); |
652 | 655 | ||
656 | /* need to after hot-added ioapic is registered */ | ||
657 | if (system_state != SYSTEM_BOOTING) | ||
658 | pci_enable_bridges(root->bus); | ||
659 | |||
653 | pci_bus_add_devices(root->bus); | 660 | pci_bus_add_devices(root->bus); |
654 | 661 | ||
655 | return 0; | 662 | return 0; |