From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ie0-f176.google.com ([209.85.223.176]:36199 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbbCLBjX (ORCPT ); Wed, 11 Mar 2015 21:39:23 -0400 Received: by iegc3 with SMTP id c3so8737686ieg.3 for ; Wed, 11 Mar 2015 18:39:22 -0700 (PDT) Date: Wed, 11 Mar 2015 20:39:18 -0500 From: Bjorn Helgaas To: Yijing Wang Cc: Jiang Liu , linux-pci@vger.kernel.org, Yinghai Lu , linux-kernel@vger.kernel.org, Marc Zyngier , linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , Guan Xuetao , linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven Subject: Re: [PATCH v6 08/30] PCI: Introduce pci_host_assign_domain_nr() to assign domain Message-ID: <20150312013918.GC10949@google.com> References: <1425868467-9667-1-git-send-email-wangyijing@huawei.com> <1425868467-9667-9-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1425868467-9667-9-git-send-email-wangyijing@huawei.com> Sender: linux-pci-owner@vger.kernel.org List-ID: On Mon, Mar 09, 2015 at 10:34:05AM +0800, Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang > Signed-off-by: Bjorn Helgaas > --- > drivers/pci/pci.c | 20 +++++++++++++++----- > include/linux/pci.h | 4 ++++ > 2 files changed, 19 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 81f06e8..c49eec1 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -4501,10 +4501,10 @@ int pci_get_new_domain_nr(void) > } > > #ifdef CONFIG_PCI_DOMAINS_GENERIC > -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > +static int pci_assign_domain_nr(struct device *dev) > { > static int use_dt_domains = -1; > - int domain = of_get_pci_domain_nr(parent->of_node); > + int domain = of_get_pci_domain_nr(dev->of_node); > > /* > * Check DT domain and use_dt_domains values. > @@ -4538,12 +4538,22 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > use_dt_domains = 0; > domain = pci_get_new_domain_nr(); > } else { > - dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", > - parent->of_node->full_name); > + dev_err(dev, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", > + dev->of_node->full_name); > domain = -1; > } > > - bus->domain_nr = domain; > + return domain; > +} > + > +void pci_host_assign_domain_nr(struct pci_host_bridge *host) > +{ > + host->domain = pci_assign_domain_nr(host->dev.parent); > +} > + > +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > +{ > + bus->domain_nr = pci_assign_domain_nr(parent); > } > #endif > #endif > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 8b3d245..2b1b998 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1327,11 +1327,15 @@ static inline int pci_domain_nr(struct pci_bus *bus) > return bus->domain_nr; > } > void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent); > +void pci_host_assign_domain_nr(struct pci_host_bridge *host); I do not think this needs to be in include/linux/pci.h. It's called only from drivers/pci/host-bridge.c, so at most, it needs to be in drivers/pci/pci.h. Better still would be if the definition could be moved from drivers/pci/pci.c to drivers/pci/host-bridge.c so we wouldn't need anything in a header file at all. > #else > static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, > struct device *parent) > { > } > +static inline void pci_host_assign_domain_nr(struct pci_host_bridge *host) > +{ > +} > #endif > > /* some architectures require additional setup to direct VGA traffic */ > -- > 1.7.1 >