From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 34/40] ACPI, PCI: Notify acpi_pci_drivers when hot-plugging PCI root bridges Date: Wed, 19 Sep 2012 11:54:48 -0700 Message-ID: <1348080894-23412-35-git-send-email-yinghai@kernel.org> References: <1348080894-23412-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1348080894-23412-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Bjorn Helgaas , Len Brown , Taku Izumi , Jiang Liu , x86 Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu List-Id: linux-acpi@vger.kernel.org From: Jiang Liu When hot-plugging PCI root bridge, acpi_pci_drivers' add()/remove() methods should be invoked to notify registered drivers. -v2: Move add calling to acpi_pci_root_start - Yinghai -v3: use acpi_pci_root pointer instead of handle - Yinghai -v3: Fold stop ioapic/iommu drivers after pci devices change in. - Yinghai Signed-off-by: Jiang Liu Signed-off-by: Yinghai Lu --- drivers/acpi/pci_root.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 325cf5c..0ea5ad0 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -633,6 +633,11 @@ end: static int acpi_pci_root_start(struct acpi_device *device) { struct acpi_pci_root *root = acpi_driver_data(device); + struct acpi_pci_driver *driver; + + list_for_each_entry(driver, &acpi_pci_drivers, node) + if (driver->add) + driver->add(root); pci_bus_add_devices(root->bus); return 0; @@ -643,6 +648,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) acpi_status status; acpi_handle handle; struct acpi_pci_root *root = acpi_driver_data(device); + struct acpi_pci_driver *driver; /* that root bus could be removed already */ if (!pci_find_bus(root->segment, root->secondary.start)) { @@ -651,8 +657,13 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) goto out; } + /* stop normal pci drivers before we stop ioapic and dmar etc */ pci_stop_root_bus(root->bus); + list_for_each_entry_reverse(driver, &acpi_pci_drivers, node) + if (driver->remove) + driver->remove(root); + device_set_run_wake(root->bus->bridge, false); pci_acpi_remove_bus_pm_notifier(device); -- 1.7.7