From patchwork Fri Mar 6 09:33: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: 447088 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 E45A3140142 for ; Fri, 6 Mar 2015 20:47:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751188AbbCFJpR (ORCPT ); Fri, 6 Mar 2015 04:45:17 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:27786 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932588AbbCFJgO (ORCPT ); Fri, 6 Mar 2015 04:36:14 -0500 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CIB77842; Fri, 06 Mar 2015 17:36:10 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Fri, 6 Mar 2015 17:36:02 +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" , Bjorn Helgaas Subject: [PATCH v5 09/29] PCI: Introduce pci_host_bridge_list to manage host bridges Date: Fri, 6 Mar 2015 17:33:26 +0800 Message-ID: <1425634426-437-10-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1425634426-437-1-git-send-email-wangyijing@huawei.com> References: <1425634426-437-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 Introduce pci_host_bridge_list to manage pci host bridges in system, so we could detect whether the host in domain:bus is alreay registered. Then we could remove bus alreay exist test in __pci_create_root_bus(). Signed-off-by: Yijing Wang Signed-off-by: Bjorn Helgaas --- drivers/pci/host-bridge.c | 24 +++++++++++++++++++++++- drivers/pci/probe.c | 8 +------- include/linux/pci.h | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 3bd45e7..0bb08ef 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(phb_mutex); + static void pci_release_host_bridge_dev(struct device *dev) { struct pci_host_bridge *bridge = to_pci_host_bridge(dev); @@ -25,7 +28,7 @@ struct pci_host_bridge *pci_create_host_bridge( int error; int bus = PCI_BUSNUM(db); int domain = PCI_DOMAIN(db); - struct pci_host_bridge *host; + struct pci_host_bridge *host, *temp; struct resource_entry *window, *n; host = kzalloc(sizeof(*host), GFP_KERNEL); @@ -40,6 +43,18 @@ struct pci_host_bridge *pci_create_host_bridge( */ pci_host_assign_domain_nr(host); + mutex_lock(&phb_mutex); + list_for_each_entry(temp, &pci_host_bridge_list, list) + if (temp->domain == host->domain + && temp->busnum == host->busnum) { + dev_dbg(&host->dev, "pci host bridge pci%04x:%02x exist\n", + host->domain, host->busnum); + mutex_unlock(&phb_mutex); + kfree(host); + return NULL; + } + mutex_unlock(&phb_mutex); + host->dev.parent = parent; INIT_LIST_HEAD(&host->windows); host->dev.release = pci_release_host_bridge_dev; @@ -55,11 +70,18 @@ struct pci_host_bridge *pci_create_host_bridge( resource_list_for_each_entry_safe(window, n, resources) list_move_tail(&window->node, &host->windows); + mutex_lock(&phb_mutex); + list_add_tail(&host->list, &pci_host_bridge_list); + mutex_unlock(&phb_mutex); return host; } void pci_free_host_bridge(struct pci_host_bridge *host) { + mutex_lock(&phb_mutex); + list_del(&host->list); + mutex_unlock(&phb_mutex); + device_unregister(&host->dev); } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 751fec3..fdb808c 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; @@ -1886,12 +1886,6 @@ static struct pci_bus *__pci_create_root_bus( b->ops = ops; b->number = b->busn_res.start = bridge->busnum; 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); diff --git a/include/linux/pci.h b/include/linux/pci.h index 463eaa3..b621f5b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -406,6 +406,7 @@ struct pci_host_bridge { struct device dev; struct pci_bus *bus; /* root bus */ struct list_head windows; /* resource_entry */ + struct list_head list; void (*release_fn)(struct pci_host_bridge *); void *release_data; };