[RFC PATCH 14/16] arm/PCI: Introduce pci_get_domain_nr()

Yijing Wang
2014-11-17T10:21:48Z

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

--
1.7.1