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 | 376f693d7af6cd44e313686a3cf3593d72239efb (patch) | |
| tree | f373dd4a5e7899a81ebed70a8517b9385d4c1eec | |
| parent | 874b0afecb8a669deddebf9ac0b8f803f42d6482 (diff) | |
| download | linux-yinghai-376f693d7af6cd44e313686a3cf3593d72239efb.tar.gz | |
PCI, x86: Move pci_enable_bridges() downfor-pci-root-bus-hotplug-part5
After we get hot-added ioapic registered.
pci_enable_bridges will try to enable ioapic irq for pci bridge.
So need to move it down.
Or We can move out pcibios_enable_irq() out of pci_enable_device()
and call pcibios_enable_irq in pci_bus_add_devices ?
also will need to move ...
pcibios_resource_survey_bus(root->bus);
pci_assign_unassigned_bus_resources(root->bus);
to the start add ....
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
| -rw-r--r-- | drivers/acpi/pci_root.c | 3 | ||||
| -rw-r--r-- | drivers/pci/probe.c | 1 | ||||
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 67f7733c45fad7..670511fde29354 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -644,6 +644,9 @@ static int acpi_pci_root_start(struct acpi_device *device) if (driver->add) driver->add(root); + /* need to after hot-added ioapic is registered */ + pci_enable_bridges(root->bus); + pci_bus_add_devices(root->bus); mutex_unlock(&acpi_pci_root_lock); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index d1013b4a86eb5a..3cc58244f953ca 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1904,6 +1904,7 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus) max = pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); + pci_enable_bridges(bus); pci_bus_add_devices(bus); return max; diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 56155c95a506fa..63cb3baac74a0a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1566,6 +1566,4 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) up_read(&pci_bus_sem); __pci_bus_assign_resources(bus, &add_list, NULL); BUG_ON(!list_empty(&add_list)); - - pci_enable_bridges(bus); } |