From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Jesse Barnes , x86 Cc: Bjorn Helgaas , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v2 19/37] PCI: Add pci_stop_and_remove_bus() Date: Fri, 9 Mar 2012 23:00:19 -0800 Message-Id: <1331362837-10740-20-git-send-email-yinghai@kernel.org> In-Reply-To: <1331362837-10740-1-git-send-email-yinghai@kernel.org> References: <1331362837-10740-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: It supports both pci root bus and pci bus under pci bridge. -v2: clear pci_bridge's subordinate. Signed-off-by: Yinghai Lu --- drivers/pci/remove.c | 32 ++++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index d4fdf7b..9ffc071 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -170,6 +170,38 @@ void pci_stop_bus_device(struct pci_dev *dev) pci_stop_dev(dev); } +static void pci_stop_host_bridge(struct pci_host_bridge *bridge) +{ + device_unregister(&bridge->dev); +} +/* + * it will support pci root bus too, in that case we need + * stop and remove host bridge + */ +void pci_stop_and_remove_bus(struct pci_bus *bus) +{ + struct pci_host_bridge *host_bridge = NULL; + struct pci_dev *pci_bridge = NULL; + + pci_stop_bus_devices(bus); + + if (pci_is_root_bus(bus)) { + host_bridge = to_pci_host_bridge(bus->bridge); + pci_stop_host_bridge(host_bridge); + } else + pci_bridge = bus->self; + + __pci_remove_bus_devices(bus); + + pci_remove_bus(bus); + + if (host_bridge) + host_bridge->bus = NULL; + + if (pci_bridge) + pci_bridge->subordinate = NULL; +} + EXPORT_SYMBOL(pci_stop_and_remove_bus_device); EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); EXPORT_SYMBOL_GPL(pci_stop_bus_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 860091f..8874b90 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -702,6 +702,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_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); extern void pci_sort_breadthfirst(void); -- 1.7.7