From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet15.oracle.com ([141.146.126.227]:21816 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189Ab2DCCVK (ORCPT ); Mon, 2 Apr 2012 22:21:10 -0400 From: Yinghai Lu To: Bjorn Helgaas , Len Brown , Jiang Liu , Suresh Siddha , x86 Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [RFC PATCH 01/14] ACPI, PCI: Stop pci devices before acpi_pci_driver remove calling Date: Mon, 2 Apr 2012 19:19:28 -0700 Message-Id: <1333419581-7836-2-git-send-email-yinghai@kernel.org> In-Reply-To: <1333419581-7836-1-git-send-email-yinghai@kernel.org> References: <1333419581-7836-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org List-ID: During stop pci drivers, it still need to access ioapic and iommu. So need to make sure those drivers need to be stop at first. Also change the acpi_pci_drivers remove calling sequence to reverse. Signed-off-by: Yinghai Lu --- drivers/acpi/pci_root.c | 11 +++++++---- drivers/pci/remove.c | 2 +- include/linux/pci.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 4a7d575..ce662ae 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -657,10 +657,6 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) mutex_lock(&acpi_pci_root_lock); - list_for_each_entry(driver, &acpi_pci_drivers, node) - if (driver->remove) - driver->remove(root->device->handle); - /* that root bus could be removed already */ if (!pci_find_bus(root->segment, root->secondary.start)) { dev_printk(KERN_DEBUG, &device->dev, @@ -668,6 +664,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_bus_devices(root->bus); + + list_for_each_entry_reverse(driver, &acpi_pci_drivers, node) + if (driver->remove) + driver->remove(root->device->handle); + device_set_run_wake(root->bus->bridge, false); pci_acpi_remove_bus_pm_notifier(device); diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 18efb31..f672731 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -118,7 +118,7 @@ static void __pci_remove_bus_devices(struct pci_bus *bus) __pci_remove_bus_device(dev); } -static void pci_stop_bus_devices(struct pci_bus *bus) +void pci_stop_bus_devices(struct pci_bus *bus) { struct pci_dev *dev, *tmp; diff --git a/include/linux/pci.h b/include/linux/pci.h index 8199563..944f49e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -706,6 +706,7 @@ extern void pci_dev_put(struct pci_dev *dev); extern void pci_remove_bus(struct pci_bus *b); extern void __pci_remove_bus_device(struct pci_dev *dev); extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); +void pci_stop_bus_devices(struct pci_bus *bus); void pci_stop_and_remove_bus(struct pci_bus *bus); extern void pci_stop_bus_device(struct pci_dev *dev); void pci_setup_cardbus(struct pci_bus *bus); -- 1.7.7