From patchwork Mon Mar 23 12:40:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 453424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8354114010F for ; Mon, 23 Mar 2015 23:48:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932074AbbCWMog (ORCPT ); Mon, 23 Mar 2015 08:44:36 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:54031 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbbCWMoL (ORCPT ); Mon, 23 Mar 2015 08:44:11 -0400 Received: from 172.24.2.119 (EHLO szxeml434-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CIW12373; Mon, 23 Mar 2015 20:44:02 +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:43:48 +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 09/31] PCI: Introduce pci_host_first_busnr() function Date: Mon, 23 Mar 2015 20:40:35 +0800 Message-ID: <1427114457-16687-10-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 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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);