From patchwork Mon Mar 23 12:40:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6072701 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 09276BF90F for ; Mon, 23 Mar 2015 12:51:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14EF52025A for ; Mon, 23 Mar 2015 12:51:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30DB62024F for ; Mon, 23 Mar 2015 12:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753104AbbCWMuY (ORCPT ); Mon, 23 Mar 2015 08:50:24 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:36317 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752730AbbCWMoW (ORCPT ); Mon, 23 Mar 2015 08:44:22 -0400 Received: from 172.24.2.119 (EHLO szxeml434-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BDN03954; Mon, 23 Mar 2015 20:44:12 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.158.1; Mon, 23 Mar 2015 20:44:01 +0800 From: Yijing Wang To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Yijing Wang" , Subject: [PATCH v7 21/31] sparc/PCI: Use pci_scan_host_bridge() for simplicity Date: Mon, 23 Mar 2015 20:40:47 +0800 Message-ID: <1427114457-16687-22-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-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.0A020205.55100A9C.01CB, 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: 7576dd5b78288d042a546ff18acd6fa8 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- arch/sparc/kernel/pci.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index e40e456..2a0f5ec 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -650,6 +650,20 @@ static void pci_claim_bus_resources(struct pci_bus *bus) pci_claim_bus_resources(child_bus); } +static int 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); + return pci_bus_child_max_busnr(host->bus); +} + +static struct pci_host_bridge_ops pci_host_ops = { + .scan_bus = pci_host_of_scan_bus, +}; + struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, struct device *parent) { @@ -667,16 +681,17 @@ 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, pbm->index, pbm->pci_first_busno, - pbm->pci_ops, pbm, &resources); - if (!bus) { - printk(KERN_ERR "Failed to create bus for %s\n", - node->full_name); + pci_host_ops.pci_ops = pbm->pci_ops; + bus = pci_scan_host_bridge(parent, pbm->index, pbm->pci_first_busno, + pbm, &resources, &pci_host_ops); + if (!host) { + pr_err("Failed to create host bridge pci%04x:%02x for %s\n", + pbm->index, pbm->pci_first_busno, node->full_name); pci_free_resource_list(&resources); return NULL; } - pci_of_scan_bus(pbm, node, bus); + bus = host->bus; pci_bus_register_of_sysfs(bus); pci_claim_bus_resources(bus);