From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com ([119.145.14.64]:40924 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbbAPDr0 (ORCPT ); Thu, 15 Jan 2015 22:47:26 -0500 From: Yijing Wang To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , Thomas Gleixner , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Yijing Wang" Subject: [PATCH 12/28] PCI: Introduce new scan function pci_scan_root_bridge() Date: Fri, 16 Jan 2015 09:44:10 +0800 Message-ID: <1421372666-12288-13-git-send-email-wangyijing@huawei.com> In-Reply-To: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-pci-owner@vger.kernel.org List-ID: Introduce new scan function pci_scan_root_bridge() to support host bridge drivers that need to provide platform own pci_host_bridge_ops. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 21 +++++++++++++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5f748ed..51d69c3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2068,6 +2068,27 @@ static struct pci_bus *__pci_scan_root_bus( return b; } +struct pci_host_bridge *pci_scan_root_bridge(struct device *parent, + u32 db, struct pci_ops *ops, void *sysdata, + struct list_head *resources, struct pci_host_bridge_ops *phb_ops) +{ + struct pci_host_bridge *host; + struct pci_bus *bus; + + host = pci_create_host_bridge(parent, db, resources, + sysdata, phb_ops); + if (!host) + return NULL; + + bus = __pci_scan_root_bus(host, ops); + if (!bus) + pci_free_host_bridge(host); + + return host; +} +EXPORT_SYMBOL(pci_scan_root_bridge); + + struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, struct pci_ops *ops, void *sysdata, struct list_head *resources) { diff --git a/include/linux/pci.h b/include/linux/pci.h index c06b95d..5592737 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -797,6 +797,9 @@ void pci_bus_release_busn_res(struct pci_bus *b); struct pci_bus *pci_scan_root_bus(struct device *parent, u32 dombus, struct pci_ops *ops, void *sysdata, struct list_head *resources); +struct pci_host_bridge *pci_scan_root_bridge(struct device *parent, + u32 dombus, struct pci_ops *ops, void *sysdata, + struct list_head *resources, struct pci_host_bridge_ops *phb_ops); struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr); void pcie_update_link_speed(struct pci_bus *bus, u16 link_status); -- 1.7.1