From patchwork Tue Apr 21 11:34:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6247571 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 05DBC9F313 for ; Tue, 21 Apr 2015 11:49:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30538202B4 for ; Tue, 21 Apr 2015 11:49: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 2E31A202AE for ; Tue, 21 Apr 2015 11:49:42 +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 1YkWdB-0004TT-Q9; Tue, 21 Apr 2015 11:46:21 +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 1YkWXl-0007bj-Pn for linux-arm-kernel@lists.infradead.org; Tue, 21 Apr 2015 11:40:47 +0000 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CML53589; Tue, 21 Apr 2015 19:37:56 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.158.1; Tue, 21 Apr 2015 19:37:47 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v10 07/29] PCI: Allocate busn resource for pci_scan_root_bus() Date: Tue, 21 Apr 2015 19:34:26 +0800 Message-ID: <1429616088-10249-8-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1429616088-10249-1-git-send-email-wangyijing@huawei.com> References: <1429616088-10249-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-20150421_044046_458134_E70EF73E X-CRM114-Status: GOOD ( 12.06 ) 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 Some pci_scan_root_bus() callers don't supply the busn resource, because they don't know the max bus number. Currently we insert default busn resource[bus-FF] to root bus, and update the max bus number after pci_scan_child_bus(). We could dynamically allocate busn resource and add it to pci_host_bridge, in the later patch, it would be easy to check whether new pci_host_bridge busn resource conflict. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c425755..0eafda2 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2041,6 +2041,8 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) int pci_bus_update_busn_res_end(struct pci_bus *b, int bus_max) { + struct resource_entry *entry; + struct pci_host_bridge *host; struct resource *res = &b->busn_res; struct resource old_res = *res; resource_size_t size; @@ -2058,6 +2060,14 @@ int pci_bus_update_busn_res_end(struct pci_bus *b, int bus_max) if (!ret && !res->parent) pci_bus_insert_busn_res(b, res->start, res->end); + if (!ret && pci_is_root_bus(b)) { + host = to_pci_host_bridge(b->bridge); + if (host->dynamic_busn) { + entry = pci_busn_resource(&host->windows); + entry->res->end = bus_max; + } + } + return ret; } @@ -2079,32 +2089,39 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources) { - struct resource_entry *window; - bool found = false; + struct resource_entry *entry; + struct resource *busn_resource = NULL; + struct pci_host_bridge *host; struct pci_bus *b; int max; - resource_list_for_each_entry(window, resources) - if (window->res->flags & IORESOURCE_BUS) { - found = true; - break; - } + entry = pci_busn_resource(resources); + if (!entry) { + busn_resource = kzalloc(sizeof (struct resource), GFP_KERNEL); + if (!busn_resource) + return NULL; + busn_resource->start = bus; + busn_resource->end = 255; + busn_resource->flags = IORESOURCE_BUS; + pci_add_resource(resources, busn_resource); + pr_info( + "No busn resource found for root bus, will use [bus %02x-ff]\n", + bus); + } b = pci_create_root_bus(parent, domain, ops, sysdata, resources); if (!b) return NULL; - if (!found) { - dev_info(&b->dev, - "No busn resource found for root bus, will use [bus %02x-ff]\n", - bus); - pci_bus_insert_busn_res(b, bus, 255); + if (busn_resource) { + host = to_pci_host_bridge(b->bridge); + host->dynamic_busn = true; } max = pci_scan_child_bus(b); - if (!found) + if (busn_resource) pci_bus_update_busn_res_end(b, max); return b;