| Message ID | 1416219710-26088-15-git-send-email-wangyijing@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Nov 17, 2014 at 10:21:48AM +0000, Yijing Wang wrote: > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > --- > arch/arm/include/asm/mach/pci.h | 9 +++++++++ > arch/arm/kernel/bios32.c | 8 ++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h > index f19f627..370b3bd 100644 > --- a/arch/arm/include/asm/mach/pci.h > +++ b/arch/arm/include/asm/mach/pci.h > @@ -90,6 +90,15 @@ extern void pci_map_io_early(unsigned long pfn); > static inline void pci_map_io_early(unsigned long pfn) {} > #endif > > +#ifdef CONFIG_PCI_DOMAINS_GENERIC > +int pci_get_domain_nr(struct device *parent) > +#else > +static inline int pci_get_domain_nr(struct device *parent) > +{ > + return 0; > +} > +#endif > + > /* > * PCI controllers > */ > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > index d8c2b4e..3fe56f1 100644 > --- a/arch/arm/kernel/bios32.c > +++ b/arch/arm/kernel/bios32.c > @@ -513,7 +513,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, > #ifdef CONFIG_PCI_DOMAINS_GENERIC > static bool dt_domain_found; > > -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > +int pci_get_domain_nr(struct device *parent) > { > int domain = of_get_pci_domain_nr(parent->of_node); > > @@ -526,8 +526,12 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > } else { > domain = pci_get_new_domain_nr(); > } > + return domain; > +} > > - bus->domain_nr = domain; > +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) > +{ > + bus->domain_nr = pci_get_domain_nr(parent); > } > #endif This code is superseded by the last patches I sent to move the domain assignment to PCI core code. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/301220.html Lorenzo -- 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/
>> >> - bus->domain_nr = domain; >> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) >> +{ >> + bus->domain_nr = pci_get_domain_nr(parent); >> } >> #endif > > This code is superseded by the last patches I sent to move the domain > assignment to PCI core code. > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/301220.html OK, I will update it based the latest one. > > Lorenzo > > > . >
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index f19f627..370b3bd 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -90,6 +90,15 @@ extern void pci_map_io_early(unsigned long pfn); static inline void pci_map_io_early(unsigned long pfn) {} #endif +#ifdef CONFIG_PCI_DOMAINS_GENERIC +int pci_get_domain_nr(struct device *parent) +#else +static inline int pci_get_domain_nr(struct device *parent) +{ + return 0; +} +#endif + /* * PCI controllers */ diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index d8c2b4e..3fe56f1 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -513,7 +513,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, #ifdef CONFIG_PCI_DOMAINS_GENERIC static bool dt_domain_found; -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +int pci_get_domain_nr(struct device *parent) { int domain = of_get_pci_domain_nr(parent->of_node); @@ -526,8 +526,12 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) } else { domain = pci_get_new_domain_nr(); } + return domain; +} - bus->domain_nr = domain; +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +{ + bus->domain_nr = pci_get_domain_nr(parent); } #endif
Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/arm/include/asm/mach/pci.h | 9 +++++++++ arch/arm/kernel/bios32.c | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)