From patchwork Tue Mar 4 15:50:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25686 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3F35E2066C for ; Tue, 4 Mar 2014 15:51:57 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf13667591pdb.1 for ; Tue, 04 Mar 2014 07:51:57 -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=C8WC9zF7n9Nsas6y7E0x4Zi7a4k3omJcUl6hqivxv5UxhIl6Wff3I2lF6bDDx41H1T pEjtd9NTnVH3zjg1Fimk7lBvmUxTuyHiFjgzut103cyq2/r4dSTA4nFfCpzA/Le9XgOO MmissviyU/HRuEM9Mz5KkQ+oFa4RrZtE6UBqb+f1C06rdbIeUcq0UJOl8F/bnflXYkfb bN23bdzM5wejekL3B27h2nOZtkIhXKaIpTr5kc+ofCc/KJD7ofq4IpirTkTSTIDThJZO +WRmYi+ot4Xklz2negRQZvkzFmcmNqMOHddssjNTO/5z91sENNjcCht2Z3fiugr6stLY S9cg== X-Gm-Message-State: ALoCoQkTNenEKW0tp/CSEcKJWDGR+wLf0HObTvwsF/tJw8MF4/CMiUP8TdbHJda180Xov6jAgXXp X-Received: by 10.66.66.163 with SMTP id g3mr108551pat.3.1393948317109; Tue, 04 Mar 2014 07:51:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.227 with SMTP id m90ls2661237qga.38.gmail; Tue, 04 Mar 2014 07:51:56 -0800 (PST) X-Received: by 10.58.200.229 with SMTP id jv5mr99093vec.15.1393948316938; Tue, 04 Mar 2014 07:51:56 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id ug9si5878652vcb.107.2014.03.04.07.51.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 07:51:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 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.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so5747923veb.25 for ; Tue, 04 Mar 2014 07:51:56 -0800 (PST) X-Received: by 10.58.247.193 with SMTP id yg1mr72352vec.41.1393948316834; Tue, 04 Mar 2014 07:51:56 -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 u1csp136035vcs; Tue, 4 Mar 2014 07:51:56 -0800 (PST) X-Received: by 10.66.146.133 with SMTP id tc5mr375234pab.58.1393948315124; Tue, 04 Mar 2014 07:51:55 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zo6si14694813pbc.13.2014.03.04.07.51.54; Tue, 04 Mar 2014 07:51:54 -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 S1754738AbaCDPuz (ORCPT + 26 others); Tue, 4 Mar 2014 10:50:55 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:51459 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754109AbaCDPuq (ORCPT ); Tue, 4 Mar 2014 10:50:46 -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 s24Fo4cV013537; Tue, 4 Mar 2014 15:50:05 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 , Arnd Bergmann Subject: [PATCH v5 3/7] pci: Create pci_host_bridge before its associated bus in pci_create_root_bus. Date: Tue, 4 Mar 2014 15:50:00 +0000 Message-Id: <1393948204-11555-4-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393948204-11555-1-git-send-email-Liviu.Dudau@arm.com> References: <1393948204-11555-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.180 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; }