From patchwork Fri Feb 28 13:08:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25546 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7168620567 for ; Fri, 28 Feb 2014 13:11:32 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id g12sf6891030oah.7 for ; Fri, 28 Feb 2014 05:11:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=JD1w/PbuGestk8ZNBQTVjn75KehKsbeqFPc0fqTO35M=; b=DtyO5RNu+f1eetv/vD2VVMt8131x16lT7KT5CnDh9DL064aEcac8D9Z+iJScZxMEPl lWV3lkay7XldGdaZvT0AXAshOg7oGlK1ea6KrqaA6ZDIf4wDwGV2oXN+ILJWiQDAq6Mv pC9jOWdLXWYvy+wTVPAMNpRD10Sgx9wGsGw7eHycooiEeORTdpZO12jsRIPD0aKkBNsO 5F6DFG8gkEN3RUqKQCmb41X4wPoRD8SEhZhAbPXB7R/qGSO6Jb10OGhNdNJd2dXVfZMz AlHmzUTobehBqYyVif0UAAxf6Kzmk/+ZSeg0fxpkuWcLKaIhYSpAu/yFFQagKjcTU0u5 3AYA== X-Gm-Message-State: ALoCoQmceVmCpAQ200U6Q3sEx5Tunw9BAhn0BaMOawt7Z5tl8OcWjXzXM6qc2+aUaSnl0tcZKJEC X-Received: by 10.50.225.6 with SMTP id rg6mr1657970igc.6.1393593091967; Fri, 28 Feb 2014 05:11:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.100 with SMTP id i91ls1077516qgf.23.gmail; Fri, 28 Feb 2014 05:11:31 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr13319563vdc.18.1393593091831; Fri, 28 Feb 2014 05:11:31 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id be7si1812426vcb.35.2014.02.28.05.11.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Feb 2014 05:11:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id lf12so693532vcb.3 for ; Fri, 28 Feb 2014 05:11:31 -0800 (PST) X-Received: by 10.52.241.106 with SMTP id wh10mr6209197vdc.16.1393593091734; Fri, 28 Feb 2014 05:11:31 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp52609vcs; Fri, 28 Feb 2014 05:11:30 -0800 (PST) X-Received: by 10.66.221.103 with SMTP id qd7mr3438341pac.44.1393593090274; Fri, 28 Feb 2014 05:11:30 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si2030525pbn.46.2014.02.28.05.11.29; Fri, 28 Feb 2014 05:11:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752209AbaB1NJA (ORCPT + 26 others); Fri, 28 Feb 2014 08:09:00 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:53568 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751581AbaB1NI4 (ORCPT ); Fri, 28 Feb 2014 08:08:56 -0500 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.1.195.170]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s1SD8MJF022677; Fri, 28 Feb 2014 13:08:22 GMT From: Liviu Dudau To: linux-pci , Bjorn Helgaas , Catalin Marinas , Will Deacon , linaro-kernel Cc: Benjamin Herrenschmidt , LKML , "devicetree@vger.kernel.org" , LAKML Subject: [PATCH v3 3/5] pci: Create pci_host_bridge before its associated bus in pci_create_root_bus. Date: Fri, 28 Feb 2014 13:08:20 +0000 Message-Id: <1393592902-24750-4-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393592902-24750-1-git-send-email-Liviu.Dudau@arm.com> References: <1393592902-24750-1-git-send-email-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: liviu.dudau@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Before commit 7b5436635800 the pci_host_bridge was created before the root bus. As that commit has added a needless dependency on the bus for pci_alloc_host_bridge() the creation order has been changed for no good reason. Revert the order of creation as we are going to depend on the pci_host_bridge structure to retrieve the domain number of the root bus. Signed-off-by: Liviu Dudau diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6e34498..78ccba0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -505,7 +505,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; @@ -514,7 +514,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; } @@ -1727,9 +1726,21 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, char bus_addr[64]; char *fmt; + bridge = pci_alloc_host_bridge(); + if (!bridge) + return NULL; + + bridge->dev.parent = parent; + bridge->dev.release = pci_release_host_bridge_dev; + error = pcibios_root_bridge_prepare(bridge); + if (error) { + kfree(bridge); + return NULL; + } + b = pci_alloc_bus(); if (!b) - return NULL; + goto err_out; b->sysdata = sysdata; b->ops = ops; @@ -1738,26 +1749,15 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, 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; + goto err_bus_out; } - bridge = pci_alloc_host_bridge(b); - if (!bridge) - goto err_out; - - bridge->dev.parent = parent; - bridge->dev.release = pci_release_host_bridge_dev; + bridge->bus = b; dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); - error = pcibios_root_bridge_prepare(bridge); - if (error) { - kfree(bridge); - goto err_out; - } - error = device_register(&bridge->dev); if (error) { put_device(&bridge->dev); - goto err_out; + goto err_bus_out; } b->bridge = get_device(&bridge->dev); device_enable_async_suspend(b->bridge); @@ -1814,8 +1814,10 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, class_dev_reg_err: put_device(&bridge->dev); device_unregister(&bridge->dev); -err_out: +err_bus_out: kfree(b); +err_out: + kfree(bridge); return NULL; }