From patchwork Mon Mar 23 12:40:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6072571 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 A82D99F318 for ; Mon, 23 Mar 2015 12:49:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D56072024C for ; Mon, 23 Mar 2015 12:49:36 +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 E7F9B200F0 for ; Mon, 23 Mar 2015 12:49:35 +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 1Ya1l6-000314-Ie; Mon, 23 Mar 2015 12:47:08 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ya1kI-0002cO-VG for linux-arm-kernel@lists.infradead.org; Mon, 23 Mar 2015 12:46:21 +0000 Received: from 172.24.2.119 (EHLO szxeml434-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CIW12382; Mon, 23 Mar 2015 20:44:03 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.158.1; Mon, 23 Mar 2015 20:43:51 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v7 11/31] PCI: Save sysdata in pci_host_bridge drvdata Date: Mon, 23 Mar 2015 20:40:37 +0800 Message-ID: <1427114457-16687-12-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> References: <1427114457-16687-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150323_054619_662775_332E2C00 X-CRM114-Status: GOOD ( 11.29 ) 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 | 3 ++- drivers/pci/pci.h | 2 +- drivers/pci/probe.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 8af6d51..b0ed8da 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -63,7 +63,7 @@ static bool pci_host_busn_res_overlap( struct pci_host_bridge *pci_create_host_bridge( struct device *parent, int domain, int bus, - struct list_head *resources) + void *sysdata, struct list_head *resources) { int error; struct pci_host_bridge *host, *tmp; @@ -101,6 +101,7 @@ struct pci_host_bridge *pci_create_host_bridge( mutex_unlock(&pci_host_mutex); host->dev.release = pci_release_host_bridge_dev; + dev_set_drvdata(&host->dev, sysdata); dev_set_name(&host->dev, "pci%04x:%02x", host->domain, bus); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 886d72f..027fba0 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -335,7 +335,7 @@ static inline void pci_host_assign_domain_nr(struct pci_host_bridge *host) #endif struct pci_host_bridge *pci_create_host_bridge(struct device *parent, - int domain, int bus, struct list_head *resources); + int domain, int bus, void *sysdata, struct list_head *resources); void pci_free_host_bridge(struct pci_host_bridge *host); static inline int pci_host_first_busnr(struct pci_host_bridge *host) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8517d1b..0ac2bf6 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 = pci_host_first_busnr(bridge); @@ -1956,11 +1955,12 @@ struct pci_bus *pci_create_root_bus(struct device *parent, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, domain, bus, resources); + host = pci_create_host_bridge(parent, domain, bus, + sysdata, resources); if (!host) return NULL; - host->bus = __pci_create_root_bus(host, ops, sysdata); + host->bus = __pci_create_root_bus(host, ops); if (!host->bus) pci_free_host_bridge(host); @@ -2037,13 +2037,12 @@ 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 pci_bus *b; int max; - b = __pci_create_root_bus(host, ops, sysdata); + b = __pci_create_root_bus(host, ops); if (!b) return NULL; @@ -2064,11 +2063,12 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, domain, bus, resources); + host = pci_create_host_bridge(parent, domain, bus, + sysdata, resources); if (!host) return NULL; - host->bus = __pci_scan_root_bus(host, ops, sysdata); + host->bus = __pci_scan_root_bus(host, ops); if (!host->bus) pci_free_host_bridge(host);