From patchwork Fri Mar 6 09:33:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5951391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 563B29F36A for ; Fri, 6 Mar 2015 09:50:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AD21203F1 for ; Fri, 6 Mar 2015 09:50:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9FF4203C4 for ; Fri, 6 Mar 2015 09:50:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YToqQ-0007RF-NQ; Fri, 06 Mar 2015 09:46:58 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YTolX-0002KE-RW for linux-arm-kernel@lists.infradead.org; Fri, 06 Mar 2015 09:41:57 +0000 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BCR79551; Fri, 06 Mar 2015 17:36:33 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Fri, 6 Mar 2015 17:36:20 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v5 19/29] sparc/PCI: Use pci_scan_host_bridge() for simplicity Date: Fri, 6 Mar 2015 17:33:36 +0800 Message-ID: <1425634426-437-20-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1425634426-437-1-git-send-email-wangyijing@huawei.com> References: <1425634426-437-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.54F97521.02A9, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 416ede887ead476ce8a24765f0a8cb4d X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150306_014156_522243_0BDA1C63 X-CRM114-Status: GOOD ( 10.92 ) X-Spam-Score: -2.3 (--) Cc: linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , sparclinux@vger.kernel.org, Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , Arnd Bergmann , Marc Zyngier , Rusty Russell , linux-m68k@lists.linux-m68k.org, Bjorn Helgaas , Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, Liviu Dudau , Tony Luck , linux-kernel@vger.kernel.org, Jiang Liu , linux-alpha@vger.kernel.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now we could use pci_scan_host_bridge() to scan pci buses, provide sparc specific pci_host_bridge_ops. Signed-off-by: Yijing Wang CC: "David S. Miller" CC: sparclinux@vger.kernel.org Signed-off-by: Bjorn Helgaas --- arch/sparc/kernel/pci.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 21f804a..7e28f74 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -650,12 +650,25 @@ static void pci_claim_bus_resources(struct pci_bus *bus) pci_claim_bus_resources(child_bus); } +static void pci_host_bridge_of_scan_bus( + struct pci_host_bridge *host) +{ + struct pci_pbm_info *pbm = dev_get_drvdata(&host->dev); + struct device_node *node = pbm->op->dev.of_node; + + pci_of_scan_bus(pbm, node, host->bus); +} + +static struct pci_host_bridge_ops phb_ops = { + .scan_bus = pci_host_bridge_of_scan_bus, +}; + struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, struct device *parent) { LIST_HEAD(resources); struct device_node *node = pbm->op->dev.of_node; - struct pci_bus *bus; + struct pci_host_bridge *host; printk("PCI: Scanning PBM %s\n", node->full_name); @@ -667,22 +680,21 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, pbm->busn.end = pbm->pci_last_busno; pbm->busn.flags = IORESOURCE_BUS; pci_add_resource(&resources, &pbm->busn); - bus = pci_create_root_bus(parent, + host = pci_scan_host_bridge(parent, PCI_DOMBUS(pbm->index, pbm->pci_first_busno), - pbm->pci_ops, pbm, &resources); - if (!bus) { - printk(KERN_ERR "Failed to create bus for %s\n", + pbm->pci_ops, pbm, &resources, &phb_ops); + if (!host) { + printk(KERN_ERR "Failed to create host bridge for %s\n", node->full_name); pci_free_resource_list(&resources); return NULL; } - pci_of_scan_bus(pbm, node, bus); - pci_bus_register_of_sysfs(bus); + pci_bus_register_of_sysfs(host->bus); - pci_claim_bus_resources(bus); - pci_bus_add_devices(bus); - return bus; + pci_claim_bus_resources(host->bus); + pci_bus_add_devices(host->bus); + return host->bus; } void pcibios_fixup_bus(struct pci_bus *pbus)