From patchwork Thu Feb 26 08:12:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5889941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 203DA9F373 for ; Thu, 26 Feb 2015 08:42:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3524D2037B for ; Thu, 26 Feb 2015 08:42:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E15820374 for ; Thu, 26 Feb 2015 08:42:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQty5-0004Xj-Nb; Thu, 26 Feb 2015 08:38:49 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQtiC-0006CX-HS for linux-arm-kernel@lists.infradead.org; Thu, 26 Feb 2015 08:22:26 +0000 Received: from 172.24.2.119 (EHLO szxeml433-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BCI61006; Thu, 26 Feb 2015 16:15:37 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.158.1; Thu, 26 Feb 2015 16:15:10 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v4 11/30] PCI: Save sysdata in pci_host_bridge drvdata Date: Thu, 26 Feb 2015 16:12:05 +0800 Message-ID: <1424938344-4017-12-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1424938344-4017-1-git-send-email-wangyijing@huawei.com> References: <1424938344-4017-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.54EED62A.01C9, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 39ecf02b6a463efe1b67d8be346d004f X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150226_002225_192042_D99BC6B7 X-CRM114-Status: GOOD ( 11.14 ) X-Spam-Score: -2.3 (--) Cc: Liviu Dudau , Rusty Russell , Russell King , Arnd Bergmann , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, "David S. Miller" , linux-alpha@vger.kernel.org, Tony Luck , Geert Uytterhoeven , Benjamin Herrenschmidt , Yijing Wang , linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , Jiang Liu , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Save platform specific sysdata in pci_host_bridge drvdata, host bridge specific operation need to access it before the pci bus creation. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 4 +++- drivers/pci/probe.c | 18 ++++++++---------- include/linux/pci.h | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 5039b3b..b42a4bb 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -23,7 +23,8 @@ static void pci_release_host_bridge_dev(struct device *dev) } struct pci_host_bridge *pci_create_host_bridge( - struct device *parent, u32 db, struct list_head *resources) + struct device *parent, u32 db, + struct list_head *resources, void *sysdata) { int error; int bus = PCI_BUSNUM(db); @@ -58,6 +59,7 @@ struct pci_host_bridge *pci_create_host_bridge( host->dev.parent = parent; INIT_LIST_HEAD(&host->windows); host->dev.release = pci_release_host_bridge_dev; + dev_set_drvdata(&host->dev, sysdata); dev_set_name(&host->dev, "pci%04x:%02x", host->domain, host->busnum); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ec4f99d..45056cb 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1865,8 +1865,7 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) } static struct pci_bus *__pci_create_root_bus( - struct pci_host_bridge *bridge, struct pci_ops *ops, - void *sysdata) + struct pci_host_bridge *bridge, struct pci_ops *ops) { int error; struct pci_bus *b; @@ -1882,7 +1881,7 @@ static struct pci_bus *__pci_create_root_bus( if (!b) return NULL; - b->sysdata = sysdata; + b->sysdata = dev_get_drvdata(&bridge->dev); b->ops = ops; b->number = b->busn_res.start = bridge->busnum; pci_bus_assign_domain_nr(b, parent); @@ -1954,11 +1953,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, u32 db, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, db, resources); + host = pci_create_host_bridge(parent, db, resources, sysdata); if (!host) return NULL; - return __pci_create_root_bus(host, ops, sysdata); + return __pci_create_root_bus(host, ops); } int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) @@ -2025,8 +2024,7 @@ void pci_bus_release_busn_res(struct pci_bus *b) } static struct pci_bus *__pci_scan_root_bus( - struct pci_host_bridge *host, struct pci_ops *ops, - void *sysdata) + struct pci_host_bridge *host, struct pci_ops *ops) { struct resource_entry *window; bool found = false; @@ -2039,7 +2037,7 @@ static struct pci_bus *__pci_scan_root_bus( break; } - b = __pci_create_root_bus(host, ops, sysdata); + b = __pci_create_root_bus(host, ops); if (!b) { pci_free_host_bridge(host); return NULL; @@ -2065,11 +2063,11 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, db, resources); + host = pci_create_host_bridge(parent, db, resources, sysdata); if (!host) return NULL; - return __pci_scan_root_bus(host, ops, sysdata); + return __pci_scan_root_bus(host, ops); } EXPORT_SYMBOL(pci_scan_root_bus); diff --git a/include/linux/pci.h b/include/linux/pci.h index 4d11228..74e038d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -418,7 +418,8 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge, int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); struct pci_host_bridge *pci_create_host_bridge( - struct device *parent, u32 dombus, struct list_head *resources); + struct device *parent, u32 dombus, + struct list_head *resources, void *sysdata); /* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for