From patchwork Sun Sep 2 21:56:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 1397761 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8721ADF283 for ; Sun, 2 Sep 2012 21:57:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756160Ab2IBV4Z (ORCPT ); Sun, 2 Sep 2012 17:56:25 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:40066 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755396Ab2IBV4W (ORCPT ); Sun, 2 Sep 2012 17:56:22 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q82LuEkg030284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 2 Sep 2012 21:56:14 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q82LuDLt000487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 2 Sep 2012 21:56:13 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q82LuDYu001587; Sun, 2 Sep 2012 16:56:13 -0500 Received: from linux-siqj.site (/75.55.221.75) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 02 Sep 2012 14:56:12 -0700 From: Yinghai Lu To: Bjorn Helgaas , 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 Subject: [PATCH part5 4/7] ACPI, PCI: Stop pci devices before acpi_pci_driver remove calling Date: Sun, 2 Sep 2012 14:56:02 -0700 Message-Id: <1346622965-30937-5-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1346622965-30937-1-git-send-email-yinghai@kernel.org> References: <1346622965-30937-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index f3402df..59aa947 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -659,10 +659,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, @@ -670,6 +666,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);