From patchwork Fri Apr 3 09:25:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6155631 Return-Path: X-Original-To: patchwork-linux-arm@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 3281CBF4A6 for ; Fri, 3 Apr 2015 09:53:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B40F203DC for ; Fri, 3 Apr 2015 09:53:23 +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 4AC26203DA for ; Fri, 3 Apr 2015 09:53:22 +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 1YdyEW-0000w8-19; Fri, 03 Apr 2015 09:49:48 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydy08-0003dv-2n for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 09:35:01 +0000 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLR08818; Fri, 03 Apr 2015 17:28:57 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 17:28:41 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v9 09/30] PCI: Introduce pci_host_first_busnr() function Date: Fri, 3 Apr 2015 17:25:43 +0800 Message-ID: <1428053164-28277-11-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> References: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150403_023456_743687_05F3D56F X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -0.0 (/) Cc: linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , Arnd Bergmann , Marc Zyngier , Rusty Russell , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, dja@axtens.net, 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 Use it to get the first bus number of the bus resource. Signed-off-by: Yijing Wang --- drivers/pci/pci.h | 11 +++++++++++ drivers/pci/probe.c | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 8526790..886d72f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -337,4 +337,15 @@ static inline void pci_host_assign_domain_nr(struct pci_host_bridge *host) struct pci_host_bridge *pci_create_host_bridge(struct device *parent, int domain, int bus, struct list_head *resources); void pci_free_host_bridge(struct pci_host_bridge *host); + +static inline int pci_host_first_busnr(struct pci_host_bridge *host) +{ + struct resource_entry *window; + + resource_list_for_each_entry(window, &host->windows) + if (window->res->flags & IORESOURCE_BUS) + return window->res->start; + return -1; +} + #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index d5a12d9..25ac741 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1864,7 +1864,7 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) { } -static struct pci_bus *__pci_create_root_bus(int bus, +static struct pci_bus *__pci_create_root_bus( struct pci_host_bridge *bridge, struct pci_ops *ops, void *sysdata) { @@ -1884,9 +1884,10 @@ static struct pci_bus *__pci_create_root_bus(int bus, b->sysdata = sysdata; b->ops = ops; - b->number = b->busn_res.start = bus; + b->number = b->busn_res.start = + pci_host_first_busnr(bridge); pci_bus_assign_domain_nr(b, parent); - b2 = pci_find_bus(pci_domain_nr(b), bus); + b2 = pci_find_bus(pci_domain_nr(b), b->number); if (b2) { /* If we already got to this bus through a different bridge, ignore it */ dev_dbg(&b2->dev, "bus already known\n"); @@ -1907,7 +1908,7 @@ static struct pci_bus *__pci_create_root_bus(int bus, b->dev.class = &pcibus_class; b->dev.parent = b->bridge; - dev_set_name(&b->dev, "%04x:%02x", bridge->domain, bus); + dev_set_name(&b->dev, "%04x:%02x", bridge->domain, b->number); error = device_register(&b->dev); if (error) goto put_dev; @@ -1927,7 +1928,7 @@ static struct pci_bus *__pci_create_root_bus(int bus, res = window->res; offset = window->offset; if (res->flags & IORESOURCE_BUS) - pci_bus_insert_busn_res(b, bus, res->end); + pci_bus_insert_busn_res(b, b->number, res->end); else pci_bus_add_resource(b, res, 0); if (offset) { @@ -1966,7 +1967,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, if (!host) return NULL; - host->bus = __pci_create_root_bus(bus, host, ops, sysdata); + host->bus = __pci_create_root_bus(host, ops, sysdata); if (!host->bus) pci_free_host_bridge(host); @@ -2042,14 +2043,14 @@ void pci_bus_release_busn_res(struct pci_bus *b) res, ret ? "can not be" : "is"); } -static struct pci_bus *__pci_scan_root_bus(int bus, +static struct pci_bus *__pci_scan_root_bus( struct pci_host_bridge *host, struct pci_ops *ops, void *sysdata) { struct pci_bus *b; int max; - b = __pci_create_root_bus(bus, host, ops, sysdata); + b = __pci_create_root_bus(host, ops, sysdata); if (!b) return NULL; @@ -2074,7 +2075,7 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, if (!host) return NULL; - host->bus = __pci_scan_root_bus(bus, host, ops, sysdata); + host->bus = __pci_scan_root_bus(host, ops, sysdata); if (!host->bus) pci_free_host_bridge(host);