From patchwork Tue Apr 21 11:34:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6247231 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 383C0BF4A6 for ; Tue, 21 Apr 2015 11:43:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8DC42025B for ; Tue, 21 Apr 2015 11:43:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E130C20253 for ; Tue, 21 Apr 2015 11:43:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755195AbbDULiz (ORCPT ); Tue, 21 Apr 2015 07:38:55 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:15505 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754743AbbDULiU (ORCPT ); Tue, 21 Apr 2015 07:38:20 -0400 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CKC39670; Tue, 21 Apr 2015 19:37:59 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.158.1; Tue, 21 Apr 2015 19:37:52 +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 v10 11/29] PCI: Save sysdata in pci_host_bridge drvdata Date: Tue, 21 Apr 2015 19:34:30 +0800 Message-ID: <1429616088-10249-12-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1429616088-10249-1-git-send-email-wangyijing@huawei.com> References: <1429616088-10249-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 | 13 ++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index e05d8fc..b1cc6ef 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -81,7 +81,7 @@ static int pci_host_busn_res_check( } struct pci_host_bridge *pci_create_host_bridge( - struct device *parent, int domain, + struct device *parent, int domain, void *sysdata, struct list_head *resources) { int error, bus; @@ -118,6 +118,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 947c05a..3d6f455 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -334,6 +334,6 @@ static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, struct resource_entry *pci_busn_resource(struct list_head *resources); void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain); struct pci_host_bridge *pci_create_host_bridge(struct device *parent, - int domain, struct list_head *resources); + int domain, void *sysdata, struct list_head *resources); void pci_free_host_bridge(struct pci_host_bridge *host); #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index d8c4da8..cba3474 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1871,8 +1871,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, bus; struct pci_bus *b; @@ -1892,7 +1891,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 = bus; pci_bus_assign_domain_nr(b, parent); @@ -1973,11 +1972,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, return NULL; } - host = pci_create_host_bridge(parent, domain, resources); + host = pci_create_host_bridge(parent, domain, 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); return NULL; @@ -2083,7 +2082,7 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, bus); } - host = pci_create_host_bridge(parent, domain, resources); + host = pci_create_host_bridge(parent, domain, sysdata, resources); if (!host) { kfree(busn_resource); return NULL; @@ -2092,7 +2091,7 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, if (busn_resource) host->dynamic_busn = true; - 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); return NULL;