[POWERPC] Merge pci_process_bridge_OF_ranges()

This merges the 32-bit and 64-bit implementations of
pci_process_bridge_OF_ranges().  The new function is cleaner than both
the old ones, and supports 64 bits ranges on ppc32 which is necessary
for the 4xx port.

It also adds some better (hopefully) output to the kernel log which
should help diagnose problems and makes better use of existing OF
parsing helpers (avoiding a few bugs of both implementations along
the way).

There are still a few unfortunate ifdef's but there is no way around
these for now at least not until some other bits of the PCI code are
made common.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 0 insertions, 93 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 6b9a8564e735..bf06926f677d 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -578,99 +578,6 @@ int pci_proc_domain(struct pci_bus *bus)
         return hose->buid != 0;
 }
 
-void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
-                                            struct device_node *dev, int prim)
-{
-        const unsigned int *ranges;
-        unsigned int pci_space;
-        unsigned long size;
-        int rlen = 0;
-        int memno = 0;
-        struct resource *res;
-        int np, na = of_n_addr_cells(dev);
-        unsigned long pci_addr, cpu_phys_addr;
-
-        np = na + 5;
-
-        /* From "PCI Binding to 1275"
-         * The ranges property is laid out as an array of elements,
-         * each of which comprises:
-         *   cells 0 - 2:       a PCI address
-         *   cells 3 or 3+4:    a CPU physical address
-         *                      (size depending on dev->n_addr_cells)
-         *   cells 4+5 or 5+6:  the size of the range
-         */
-        ranges = of_get_property(dev, "ranges", &rlen);
-        if (ranges == NULL)
-                return;
-        hose->io_base_phys = 0;
-        while ((rlen -= np * sizeof(unsigned int)) >= 0) {
-                res = NULL;
-                pci_space = ranges[0];
-                pci_addr = ((unsigned long)ranges[1] << 32) | ranges[2];
-                cpu_phys_addr = of_translate_address(dev, &ranges[3]);
-                size = ((unsigned long)ranges[na+3] << 32) | ranges[na+4];
-                ranges += np;
-                if (size == 0)
-                        continue;
-
-                /* Now consume following elements while they are contiguous */
-                while (rlen >= np * sizeof(unsigned int)) {
-                        unsigned long addr, phys;
-
-                        if (ranges[0] != pci_space)
-                                break;
-                        addr = ((unsigned long)ranges[1] << 32) | ranges[2];
-                        phys = ranges[3];
-                        if (na >= 2)
-                                phys = (phys << 32) | ranges[4];
-                        if (addr != pci_addr + size ||
-                            phys != cpu_phys_addr + size)
-                                break;
-
-                        size += ((unsigned long)ranges[na+3] << 32)
-                                | ranges[na+4];
-                        ranges += np;
-                        rlen -= np * sizeof(unsigned int);
-                }
-
-                switch ((pci_space >> 24) & 0x3) {
-                case 1:         /* I/O space */
-                        hose->io_base_phys = cpu_phys_addr - pci_addr;
-                        /* handle from 0 to top of I/O window */
-                        hose->pci_io_size = pci_addr + size;
-
-                        res = &hose->io_resource;
-                        res->flags = IORESOURCE_IO;
-                        res->start = pci_addr;
-                        DBG("phb%d: IO 0x%lx -> 0x%lx\n", hose->global_number,
-                                    res->start, res->start + size - 1);
-                        break;
-                case 2:         /* memory space */
-                        memno = 0;
-                        while (memno < 3 && hose->mem_resources[memno].flags)
-                                ++memno;
-
-                        if (memno == 0)
-                                hose->pci_mem_offset = cpu_phys_addr - pci_addr;
-                        if (memno < 3) {
-                                res = &hose->mem_resources[memno];
-                                res->flags = IORESOURCE_MEM;
-                                res->start = cpu_phys_addr;
-                                DBG("phb%d: MEM 0x%lx -> 0x%lx\n", hose->global_number,
-                                            res->start, res->start + size - 1);
-                        }
-                        break;
-                }
-                if (res != NULL) {
-                        res->name = dev->full_name;
-                        res->end = res->start + size - 1;
-                        res->parent = NULL;
-                        res->sibling = NULL;
-                        res->child = NULL;
-                }
-        }
-}
 
 #ifdef CONFIG_HOTPLUG