From patchwork Fri Apr 3 09:25:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6155371 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 8D9119F398 for ; Fri, 3 Apr 2015 09:38:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1D8F20396 for ; Fri, 3 Apr 2015 09:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B3AC203C0 for ; Fri, 3 Apr 2015 09:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905AbbDCJiO (ORCPT ); Fri, 3 Apr 2015 05:38:14 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:55331 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752709AbbDCJ3R (ORCPT ); Fri, 3 Apr 2015 05:29:17 -0400 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLR08842; Fri, 03 Apr 2015 17:28:59 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 17:28:43 +0800 From: Yijing Wang To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , , Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Yijing Wang" Subject: [PATCH v9 11/30] PCI: Save sysdata in pci_host_bridge drvdata Date: Fri, 3 Apr 2015 17:25:45 +0800 Message-ID: <1428053164-28277-13-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> References: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 dffb345..98047c6 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);