===================================================================
@@ -39,6 +39,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/apei.h>
+#include <linux/pci_hotplug.h>
#define PREFIX "ACPI: "
@@ -462,6 +463,10 @@ static int __devinit acpi_pci_root_add(s
if (!root)
return -ENOMEM;
+ if (system_state != SYSTEM_BOOTING) {
+ root->hot_added = true;
+ }
+
segment = 0;
status = acpi_evaluate_integer(device->handle, METHOD_NAME__SEG, NULL,
&segment);
@@ -640,12 +645,25 @@ static int acpi_pci_root_start(struct ac
{
struct acpi_pci_root *root = acpi_driver_data(device);
struct acpi_pci_driver *driver;
+ struct pci_dev *pdev;
mutex_lock(&acpi_pci_root_lock);
list_for_each_entry(driver, &acpi_pci_drivers, node)
if (driver->add)
driver->add(device->handle);
+ /*
+ * Devices under hot-added hostbridge have no chance to assign
+ * resources and to configure them, so do that here
+ */
+ if (root->hot_added) {
+ pci_bus_size_bridges(root->bus);
+ pci_bus_assign_resources(root->bus);
+ list_for_each_entry(pdev, &root->bus->devices, bus_list)
+ pci_configure_slot(pdev);
+ pci_enable_bridges(root->bus);
+ }
+
pci_bus_add_devices(root->bus);
mutex_unlock(&acpi_pci_root_lock);
===================================================================
@@ -407,6 +407,7 @@ struct acpi_pci_root {
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
phys_addr_t mcfg_addr;
+ bool hot_added;
};
/* helper */
Devices under hot-added hostbridge have no chance to assign resources and to configure them, so this patch adds such code for hot-added hostbridges at acpi_pci_root_start(). Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> --- drivers/acpi/pci_root.c | 18 ++++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 19 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html