From patchwork Fri Aug 10 06:14:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taku Izumi X-Patchwork-Id: 1304211 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 40D863FC66 for ; Fri, 10 Aug 2012 06:15:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754481Ab2HJGPD (ORCPT ); Fri, 10 Aug 2012 02:15:03 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:55394 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458Ab2HJGPA (ORCPT ); Fri, 10 Aug 2012 02:15:00 -0400 Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 6B4BE3EE0C0; Fri, 10 Aug 2012 15:14:59 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 4A69745DEB3; Fri, 10 Aug 2012 15:14:59 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 30CA745DEAD; Fri, 10 Aug 2012 15:14:59 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 241E51DB8041; Fri, 10 Aug 2012 15:14:59 +0900 (JST) Received: from m0001.s.css.fujitsu.com (m0001.s.css.fujitsu.com [10.23.4.186]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id C63E51DB803E; Fri, 10 Aug 2012 15:14:58 +0900 (JST) Received: from m0001.css.fujitsu.com (m0001 [127.0.0.1]) by m0001.s.css.fujitsu.com (Postfix) with ESMTP id B6FD610190F; Fri, 10 Aug 2012 15:14:58 +0900 (JST) Received: from DEUCALION (unknown [10.124.101.32]) by m0001.s.css.fujitsu.com (Postfix) with SMTP id 9727010149F; Fri, 10 Aug 2012 15:14:58 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Date: Fri, 10 Aug 2012 15:14:55 +0900 From: Taku Izumi To: Taku Izumi Cc: linux-pci@vger.kernel.org, bhelgaas@google.com, linux-acpi@vger.kernel.org, kaneshige.kenji@jp.fujitsu.com, yinghai@kernel.org, jiang.liu@huawei.com Subject: [PATCH 6/7][RESEND] ACPI, PCI: add hostbridge removal function Message-Id: <20120810151455.d881caf4.izumi.taku@jp.fujitsu.com> In-Reply-To: <20120810150955.e4ab3c7f.izumi.taku@jp.fujitsu.com> References: <20120810150955.e4ab3c7f.izumi.taku@jp.fujitsu.com> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently there's no PCI-related clean-up code in acpi_pci_root_remove() function. This patch introduces function for hostbridge removal. Signed-off-by: Taku Izumi --- drivers/acpi/pci_bind.c | 7 +++++++ drivers/acpi/pci_root.c | 8 ++++++++ drivers/pci/remove.c | 18 +++++++++++++++++- include/acpi/acpi_drivers.h | 1 + include/linux/pci.h | 2 ++ 5 files changed, 35 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: Bjorn-next-0718/drivers/pci/remove.c =================================================================== --- Bjorn-next-0718.orig/drivers/pci/remove.c +++ Bjorn-next-0718/drivers/pci/remove.c @@ -143,7 +143,7 @@ void pci_stop_and_remove_behind_bridge(s __pci_remove_behind_bridge(dev); } -static void pci_stop_bus_devices(struct pci_bus *bus) +void pci_stop_bus_devices(struct pci_bus *bus) { struct list_head *l, *n; @@ -179,4 +179,20 @@ void pci_stop_bus_device(struct pci_dev EXPORT_SYMBOL(pci_stop_and_remove_bus_device); EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); +EXPORT_SYMBOL(pci_stop_bus_devices); EXPORT_SYMBOL_GPL(pci_stop_bus_device); + +void pci_remove_host_bridge(struct pci_host_bridge *bridge) +{ + struct list_head *l, *n; + struct pci_bus *root = bridge->bus; + + list_for_each_safe(l, n, &root->devices) + __pci_remove_bus_device(pci_dev_b(l)); + + pci_remove_bus(root); + + device_unregister(&bridge->dev); +} +EXPORT_SYMBOL(pci_remove_host_bridge); + Index: Bjorn-next-0718/drivers/acpi/pci_root.c =================================================================== --- Bjorn-next-0718.orig/drivers/acpi/pci_root.c +++ Bjorn-next-0718/drivers/acpi/pci_root.c @@ -656,9 +656,12 @@ static int acpi_pci_root_remove(struct a { struct acpi_pci_root *root = acpi_driver_data(device); struct acpi_pci_driver *driver; + struct pci_host_bridge *bridge = to_pci_host_bridge(root->bus->bridge); mutex_lock(&acpi_pci_root_lock); + pci_stop_bus_devices(root->bus); + list_for_each_entry(driver, &acpi_pci_drivers, node) if (driver->remove) driver->remove(root->device->handle); @@ -666,6 +669,11 @@ static int acpi_pci_root_remove(struct a device_set_run_wake(root->bus->bridge, false); pci_acpi_remove_bus_pm_notifier(device); + acpi_pci_irq_del_prt(root->bus); + acpi_pci_unbind_root(device); + + pci_remove_host_bridge(bridge); + list_del_rcu(&root->node); mutex_unlock(&acpi_pci_root_lock); synchronize_rcu(); Index: Bjorn-next-0718/include/linux/pci.h =================================================================== --- Bjorn-next-0718.orig/include/linux/pci.h +++ Bjorn-next-0718/include/linux/pci.h @@ -736,7 +736,9 @@ extern void pci_dev_put(struct pci_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); +extern void pci_stop_bus_devices(struct pci_bus *bus); extern void pci_stop_bus_device(struct pci_dev *dev); +extern void pci_remove_host_bridge(struct pci_host_bridge *bridge); void pci_setup_cardbus(struct pci_bus *bus); extern void pci_sort_breadthfirst(void); #define dev_is_pci(d) ((d)->bus == &pci_bus_type) Index: Bjorn-next-0718/drivers/acpi/pci_bind.c =================================================================== --- Bjorn-next-0718.orig/drivers/acpi/pci_bind.c +++ Bjorn-next-0718/drivers/acpi/pci_bind.c @@ -118,3 +118,10 @@ int acpi_pci_bind_root(struct acpi_devic return 0; } + +void acpi_pci_unbind_root(struct acpi_device *device) +{ + device->ops.bind = NULL; + device->ops.unbind = NULL; +} + Index: Bjorn-next-0718/include/acpi/acpi_drivers.h =================================================================== --- Bjorn-next-0718.orig/include/acpi/acpi_drivers.h +++ Bjorn-next-0718/include/acpi/acpi_drivers.h @@ -101,6 +101,7 @@ struct pci_bus; struct pci_dev *acpi_get_pci_dev(acpi_handle); int acpi_pci_bind_root(struct acpi_device *device); +void acpi_pci_unbind_root(struct acpi_device *device); /* Arch-defined function to add a bus to the system */