From patchwork Mon Jul 20 12:01:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6826581 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 BF063C05AC for ; Mon, 20 Jul 2015 12:06:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F99120617 for ; Mon, 20 Jul 2015 12:06:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4176C2060A for ; Mon, 20 Jul 2015 12:05:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644AbbGTMF4 (ORCPT ); Mon, 20 Jul 2015 08:05:56 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:43523 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbbGTMFy (ORCPT ); Mon, 20 Jul 2015 08:05:54 -0400 Received: from 172.24.1.47 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.47]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COZ21655; Mon, 20 Jul 2015 20:05:32 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.158.1; Mon, 20 Jul 2015 20:05:22 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , , 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 part3 v12 07/10] PCI: Create pci host bridge prior to root bus Date: Mon, 20 Jul 2015 20:01:15 +0800 Message-ID: <1437393678-4077-8-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1437393678-4077-1-git-send-email-wangyijing@huawei.com> References: <1437393678-4077-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 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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_host_bridge hold the domain number, we need to assign domain number prior to root bus creation, because root bus need to know the domain number to check whether it's alreay exist. Also it's preparation for separating pci_host_bridge creation from pci_create_root_bus(). Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 58 +++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0ae8bf2..cb525aa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -515,7 +515,7 @@ static void pci_release_host_bridge_dev(struct device *dev) kfree(bridge); } -static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) +static struct pci_host_bridge *pci_alloc_host_bridge(void) { struct pci_host_bridge *bridge; @@ -524,7 +524,6 @@ static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) return NULL; INIT_LIST_HEAD(&bridge->windows); - bridge->bus = b; return bridge; } @@ -1938,48 +1937,53 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, { int error; struct pci_host_bridge *bridge; - struct pci_bus *b, *b2; + struct pci_bus *b; struct resource_entry *window, *n; struct resource *res; resource_size_t offset; char bus_addr[64]; char *fmt; - b = pci_alloc_bus(NULL); - if (!b) + bridge = pci_alloc_host_bridge(); + if (!bridge) return NULL; - b->sysdata = sysdata; - b->ops = ops; - b->number = b->busn_res.start = bus; - pci_bus_assign_domain_nr(b, parent); - b2 = pci_find_bus(pci_domain_nr(b), bus); - if (b2) { + bridge->dev.parent = parent; + pci_host_assign_domain_nr(bridge, domain); + + b = pci_find_bus(bridge->domain, bus); + if (b) { /* If we already got to this bus through a different bridge, ignore it */ - dev_dbg(&b2->dev, "bus already known\n"); - goto err_out; + dev_dbg(&b->dev, "bus already known\n"); + kfree(bridge); + return NULL; } - bridge = pci_alloc_host_bridge(b); - if (!bridge) - goto err_out; - - bridge->domain = domain; - bridge->dev.parent = parent; bridge->dev.release = pci_release_host_bridge_dev; dev_set_drvdata(&bridge->dev, sysdata); - dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); + dev_set_name(&bridge->dev, "pci%04x:%02x", bridge->domain, bus); error = pcibios_root_bridge_prepare(bridge); if (error) { kfree(bridge); - goto err_out; + return NULL; } error = device_register(&bridge->dev); if (error) { put_device(&bridge->dev); - goto err_out; + return NULL; } + + b = pci_alloc_bus(NULL); + if (!b) + goto unregister_host; + + bridge->bus = b; + b->sysdata = sysdata; + b->ops = ops; + b->number = b->busn_res.start = bus; + pci_bus_assign_domain_nr(b, parent); + b->bridge = get_device(&bridge->dev); device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); @@ -1992,11 +1996,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus); error = pcibios_root_bus_prepare(bridge); if (error) - goto class_dev_reg_err; + goto free_bus; error = device_register(&b->dev); if (error) - goto class_dev_reg_err; + goto free_bus; pcibios_add_bus(b); @@ -2036,11 +2040,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, return b; -class_dev_reg_err: +free_bus: + kfree(b); put_device(&bridge->dev); +unregister_host: device_unregister(&bridge->dev); -err_out: - kfree(b); return NULL; } EXPORT_SYMBOL_GPL(pci_create_root_bus);