From patchwork Tue Apr 21 11:34:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6247581 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 34727BF4A6 for ; Tue, 21 Apr 2015 11:49:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DDF4202D1 for ; Tue, 21 Apr 2015 11:49:58 +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 5CF15202AE for ; Tue, 21 Apr 2015 11:49:57 +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 1YkWdv-0004ne-F1; Tue, 21 Apr 2015 11:47:07 +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-0007iW-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 CML53588; Tue, 21 Apr 2015 19:37:55 +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:45 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v10 06/29] PCI: Alloc busn resource dynamically for pci_scan_bus() Date: Tue, 21 Apr 2015 19:34:25 +0800 Message-ID: <1429616088-10249-7-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_459248_EA212B87 X-CRM114-Status: GOOD ( 15.47 ) 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 Pci_scan_bus() always add the global busn_resource[00-FF], the busn resource added is not accurate, if root bus number is not equal to zero, the bus range bellow root bus number is pointless, and this inaccurate busn resource would make host bridge confuse, this patch dynamically allocate busn resource instead of default global one, and add a flag to pci_host_bridge, so when pci_host_bridge go to free, the dynamic busn resource could also be freed properly. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 27 +++++++++++++++++++-------- include/linux/pci.h | 1 + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 52b9257..c425755 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -18,13 +18,6 @@ #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ #define CARDBUS_RESERVE_BUSNR 3 -static struct resource busn_resource = { - .name = "PCI busn", - .start = 0, - .end = 255, - .flags = IORESOURCE_BUS, -}; - /* Ugh. Need to stop exporting this to modules. */ LIST_HEAD(pci_root_buses); EXPORT_SYMBOL(pci_root_buses); @@ -516,11 +509,17 @@ static struct pci_bus *pci_alloc_bus(struct pci_bus *parent) static void pci_release_host_bridge_dev(struct device *dev) { + struct resource_entry *entry; struct pci_host_bridge *bridge = to_pci_host_bridge(dev); if (bridge->release_fn) bridge->release_fn(bridge); + if (bridge->dynamic_busn) { + entry = pci_busn_resource(&bridge->windows); + kfree(entry->res); + } + pci_free_resource_list(&bridge->windows); kfree(bridge); @@ -2117,15 +2116,27 @@ struct pci_bus *pci_scan_bus(int domain, int bus, { LIST_HEAD(resources); struct pci_bus *b; + struct resource *busn_resource; + struct pci_host_bridge *host; + + 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, &ioport_resource); pci_add_resource(&resources, &iomem_resource); - pci_add_resource(&resources, &busn_resource); + pci_add_resource(&resources, busn_resource); b = pci_create_root_bus(NULL, domain, ops, sysdata, &resources); if (b) { + host = to_pci_host_bridge(b->bridge); + host->dynamic_busn = true; pci_scan_child_bus(b); } else { + kfree(busn_resource); pci_free_resource_list(&resources); } return b; diff --git a/include/linux/pci.h b/include/linux/pci.h index df77a62..0716158 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -402,6 +402,7 @@ static inline int pci_channel_offline(struct pci_dev *pdev) struct pci_host_bridge { int domain; + bool dynamic_busn; struct device dev; struct pci_bus *bus; /* root bus */ struct list_head windows; /* resource_entry */