On 04/30/2012 04:32 AM, John Crispin wrote:
Implement pci_load_OF_ranges on MIPS. Due to lack of test hardware only 32bit bus
width is supported. This function is based on the implementation found on powerpc.
Signed-off-by: John Crispin<blogic@xxxxxxxxxxx>
---
arch/mips/include/asm/pci.h | 12 +++++++++
arch/mips/pci/pci.c | 57 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index fcd4060..fdc47c5 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -17,6 +17,9 @@
*/
#include<linux/ioport.h>
+#ifdef CONFIG_OF
+#include<linux/of.h>
+#endif
No need for the #ifdef here.
/*
* Each pci channel is a top-level PCI bus seem by CPU. A machine with
@@ -26,6 +29,9 @@
struct pci_controller {
struct pci_controller *next;
struct pci_bus *bus;
+#ifdef CONFIG_OF
+ struct device_node *of_node;
+#endif
Probably no #ifdef here either.
struct pci_ops *pci_ops;
struct resource *mem_resource;
@@ -142,4 +148,10 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
extern char * (*pcibios_plat_setup)(char *str);
+#ifdef CONFIG_OF
+/* this function parses memory ranges from a device node */
+extern void __devinit pci_load_OF_ranges(struct pci_controller *hose,
+ struct device_node *node);
+#endif
Again, no #ifdef.
+
#endif /* _ASM_PCI_H */
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0514866..e211819 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -16,6 +16,7 @@
#include<linux/init.h>
#include<linux/types.h>
#include<linux/pci.h>
+#include<linux/of_address.h>
#include<asm/cpu-info.h>
@@ -114,8 +115,64 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
pci_bus_assign_resources(bus);
pci_enable_bridges(bus);
}
+#ifdef CONFIG_OF
+ bus->dev.of_node = hose->of_node;
+#endif
Same here.
+ }
+}
+
+#ifdef CONFIG_OF
+void __devinit pci_load_OF_ranges(struct pci_controller *hose,
+ struct device_node *node)
+{
s/load_OF/load_of/
+ const __be32 *ranges;
+ int rlen;
+ int pna = of_n_addr_cells(node);
+ int np = pna + 5;
+
+ pr_info("PCI host bridge %s ranges:\n", node->full_name);
+ ranges = of_get_property(node, "ranges",&rlen);
+ if (ranges == NULL)
+ return;
+ hose->of_node = node;
+
+ while ((rlen -= np * 4)>= 0) {
+ u32 pci_space;
+ struct resource *res = 0;
+ unsigned long long addr, size;
+
+ pci_space = ranges[0];
+ addr = of_translate_address(node, ranges + 3);
+ size = of_read_number(ranges + pna + 3, 2);
All of this should be able to be replaced with of_get_address();
There is a bunch of of/pci related infrastructure. Can any of it be
leveraged?
+ ranges += np;
+ switch ((pci_space>> 24)& 0x3) {
+ case 1: /* PCI IO space */
+ pr_info(" IO 0x%016llx..0x%016llx\n",
+ addr, addr + size - 1);
+ hose->io_map_base =
+ (unsigned long)ioremap(addr, size);
+ res = hose->io_resource;
+ res->flags = IORESOURCE_IO;
+ break;
+ case 2: /* PCI Memory space */
+ case 3: /* PCI 64 bits Memory space */
+ pr_info(" MEM 0x%016llx..0x%016llx\n",
+ addr, addr + size - 1);
+ res = hose->mem_resource;
+ res->flags = IORESOURCE_MEM;
+ break;
+ }
+ if (res != NULL) {
+ res->start = addr;
+ res->name = node->full_name;
+ res->end = res->start + size - 1;
+ res->parent = NULL;
+ res->sibling = NULL;
+ res->child = NULL;
+ }
}
}
+#endif
static DEFINE_MUTEX(pci_scan_mutex);
