From patchwork Mon Mar 3 17:33:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25625 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9E47B206F3 for ; Mon, 3 Mar 2014 17:37:53 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf24302005ykr.2 for ; Mon, 03 Mar 2014 09:37:53 -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=e+33P/DeMWM/mfbLaMXbWEefFJjIuTulIOkaQ4UB1Y2KK/Id6/c+DbiqdR4mGB/0K1 gmW88vQK9DUt19FQ4a9bGh2Q2viwSdHCQG/p8IEJA2Plu/ANfrEsKsKARBfSB7U0s+eC UqSTCaoPoYg4aKz8EoicFazJN32dnbQn6RnIZyhn6tyBr68ZS7Q6PZLpEGRAUvdp6ToL V8SIEAaagEn1fjW6jFp4NUsNM+cQAKu7iGpwiPF/7o91l80dtVe36JBA1bVOqkpA0RGL yVwTo5xAA5ZHn2HzoqqVqhekf2PeqFmj1z3PeGgkTIMCdvTeFmBUUDwpfaFwfHEIjhrh zALA== X-Gm-Message-State: ALoCoQnopBaKtZ6zu0WEJxMadV6EoklJ3ujNOvDoau4dZ0E3XIKtpGSbIZFXSliDeKkC/Alzc9Ib X-Received: by 10.236.39.99 with SMTP id c63mr8286178yhb.31.1393868273321; Mon, 03 Mar 2014 09:37:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.134 with SMTP id u6ls2066994qge.79.gmail; Mon, 03 Mar 2014 09:37:53 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr17967639vco.25.1393868273083; Mon, 03 Mar 2014 09:37:53 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id w5si4927890vcl.66.2014.03.03.09.37.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Mar 2014 09:37:53 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.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.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so4035747veb.3 for ; Mon, 03 Mar 2014 09:37:53 -0800 (PST) X-Received: by 10.220.11.141 with SMTP id t13mr8085858vct.30.1393868272980; Mon, 03 Mar 2014 09:37:52 -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 u1csp70082vcs; Mon, 3 Mar 2014 09:37:52 -0800 (PST) X-Received: by 10.68.249.34 with SMTP id yr2mr10564400pbc.11.1393868272126; Mon, 03 Mar 2014 09:37:52 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg2si11390212pbc.173.2014.03.03.09.37.51; Mon, 03 Mar 2014 09:37:51 -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 S1754777AbaCCRhq (ORCPT + 26 others); Mon, 3 Mar 2014 12:37:46 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:53675 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753976AbaCCReB (ORCPT ); Mon, 3 Mar 2014 12:34:01 -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 s23HXGxA016067; Mon, 3 Mar 2014 17:33:18 GMT From: Liviu Dudau To: linux-pci , Bjorn Helgaas , Catalin Marinas , Will Deacon , linaro-kernel Cc: Benjamin Herrenschmidt , LKML , "devicetree@vger.kernel.org" , LAKML , Tanmay Inamdar Subject: [PATCH v4 3/6] pci: Create pci_host_bridge before its associated bus in pci_create_root_bus. Date: Mon, 3 Mar 2014 17:33:13 +0000 Message-Id: <1393867996-32299-4-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393867996-32299-1-git-send-email-Liviu.Dudau@arm.com> References: <1393867996-32299-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.128.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; }