| Message ID | 1425868467-9667-9-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
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 <wangyijing@huawei.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>> 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. This is a good idea, thanks. > >> #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 >> > > . >
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); #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 */