Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753701AbbDCJco (ORCPT ); Fri, 3 Apr 2015 05:32:44 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:24058 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbbDCJck (ORCPT ); Fri, 3 Apr 2015 05:32:40 -0400 Message-ID: <551E5E1E.6050209@huawei.com> Date: Fri, 3 Apr 2015 17:32:14 +0800 From: Yijing Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Yijing Wang , 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 Subject: Re: [PATCH] PCI: Save sysdata in pci_host_bridge drvdata References: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> <1428053164-28277-2-git-send-email-wangyijing@huawei.com> In-Reply-To: <1428053164-28277-2-git-send-email-wangyijing@huawei.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.27.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.551E5E35.0045,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: 7a2174110847f8ee5163d3e8562b8df6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4293 Lines: 132 Please ignore this one, it is the same as [PATCH v9 11/30] PCI: Save sysdata in pci_host_bridge drvdata. Thanks! Yijing. On 2015/4/3 17:25, Yijing Wang wrote: > 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..aa8dff6 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); > > -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/