From patchwork Tue Mar 24 03:34:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6076531 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 91ED99F820 for ; Tue, 24 Mar 2015 03:42:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C25B6201ED for ; Tue, 24 Mar 2015 03:42:34 +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 AD3CC200E6 for ; Tue, 24 Mar 2015 03:42:33 +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 1YaFgM-0005bX-4s; Tue, 24 Mar 2015 03:39:10 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YaFg5-0005QX-Pc for linux-arm-kernel@lists.infradead.org; Tue, 24 Mar 2015 03:38:56 +0000 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CIW74375; Tue, 24 Mar 2015 11:37:15 +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, 24 Mar 2015 11:36:48 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v8 10/30] PCI: Introduce pci_host_bridge_list to manage host bridges Date: Tue, 24 Mar 2015 11:34:04 +0800 Message-ID: <1427168064-8657-11-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1427168064-8657-1-git-send-email-wangyijing@huawei.com> References: <1427168064-8657-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-20150323_203854_494676_C91E0346 X-CRM114-Status: GOOD ( 14.58 ) X-Spam-Score: -2.3 (--) Cc: Liviu Dudau , Rusty Russell , Russell King , Arnd Bergmann , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, "David S. Miller" , linux-alpha@vger.kernel.org, Tony Luck , Geert Uytterhoeven , Benjamin Herrenschmidt , Yijing Wang , linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , Jiang Liu , linux-arm-kernel@lists.infradead.org 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 Introduce pci_host_bridge_list to manage pci host bridges in system, this make us have the ability to check whether the new host would conflict with existing one. Then we could remove bus alreay exist check in __pci_create_root_bus(). Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 41 ++++++++++++++++++++++++++++++++++++++++- drivers/pci/probe.c | 9 +-------- include/linux/pci.h | 1 + 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 1a9834b..8af6d51 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -8,6 +8,9 @@ #include "pci.h" +static LIST_HEAD(pci_host_bridge_list); +static DEFINE_MUTEX(pci_host_mutex); + static void pci_release_host_bridge_dev(struct device *dev) { struct pci_host_bridge *bridge = to_pci_host_bridge(dev); @@ -41,12 +44,29 @@ static void pci_host_update_busn_res( pci_add_resource(resources, &host->busn_res); } +static bool pci_host_busn_res_overlap( + struct pci_host_bridge *new, struct pci_host_bridge *old) +{ + struct resource_entry *entry; + struct resource *res1 = NULL, *res2 = NULL; + + resource_list_for_each_entry(entry, &old->windows) + if (entry->res->flags & IORESOURCE_BUS) + res1 = entry->res; + + resource_list_for_each_entry(entry, &new->windows) + if (entry->res->flags & IORESOURCE_BUS) + res2 = entry->res; + + return resource_overlaps(res1, res2); +} + struct pci_host_bridge *pci_create_host_bridge( struct device *parent, int domain, int bus, struct list_head *resources) { int error; - struct pci_host_bridge *host; + struct pci_host_bridge *host, *tmp; struct resource_entry *window, *n; host = kzalloc(sizeof(*host), GFP_KERNEL); @@ -65,6 +85,21 @@ struct pci_host_bridge *pci_create_host_bridge( */ host->domain = domain; pci_host_assign_domain_nr(host); + mutex_lock(&pci_host_mutex); + list_for_each_entry(tmp, &pci_host_bridge_list, list) { + if (tmp->domain != host->domain + || pci_host_busn_res_overlap(host, tmp)) { + pr_warn("pci host bridge pci%04x:%02x exist\n", + host->domain, bus); + mutex_unlock(&pci_host_mutex); + pci_free_resource_list(&host->windows); + kfree(host); + return NULL; + } + } + list_add_tail(&host->list, &pci_host_bridge_list); + mutex_unlock(&pci_host_mutex); + host->dev.release = pci_release_host_bridge_dev; dev_set_name(&host->dev, "pci%04x:%02x", host->domain, bus); @@ -80,6 +115,10 @@ struct pci_host_bridge *pci_create_host_bridge( void pci_free_host_bridge(struct pci_host_bridge *host) { + mutex_lock(&pci_host_mutex); + list_del(&host->list); + mutex_unlock(&pci_host_mutex); + device_unregister(&host->dev); } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 25ac741..8517d1b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1869,7 +1869,7 @@ static struct pci_bus *__pci_create_root_bus( void *sysdata) { int error; - struct pci_bus *b, *b2; + struct pci_bus *b; struct resource_entry *window; struct device *parent; struct resource *res; @@ -1887,12 +1887,6 @@ static struct pci_bus *__pci_create_root_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), 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"); - goto err_out; - } bridge->bus = b; b->bridge = get_device(&bridge->dev); @@ -1952,7 +1946,6 @@ static struct pci_bus *__pci_create_root_bus( put_dev: put_device(&bridge->dev); -err_out: kfree(b); return NULL; } diff --git a/include/linux/pci.h b/include/linux/pci.h index f189dfb..91cba01 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -407,6 +407,7 @@ struct pci_host_bridge { /* we use default bus resource if no bus resource provided */ struct resource busn_res; struct list_head windows; /* resource_entry */ + struct list_head list; void (*release_fn)(struct pci_host_bridge *); void *release_data; };