Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 25 insertions, 3 deletions

diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index f7fae5f153b2..50c75eec8874 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -815,8 +815,7 @@ EXPORT_SYMBOL(pci_device_to_OF_node);
  * to set pci_assign_all_buses to 1 and still use RTAS for PCI
  * config cycles.
  */
-struct pci_controller*
-pci_find_hose_for_OF_device(struct device_node* node)
+struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
 {
         if (!have_of)
                 return NULL;
@@ -942,7 +941,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
         while (ranges && (rlen -= np * sizeof(unsigned int)) >= 0) {
                 res = NULL;
                 size = ranges[na+4];
-                switch (ranges[0] >> 24) {
+                switch ((ranges[0] >> 24) & 0x3) {
                 case 1:         /* I/O space */
                         if (ranges[2] != 0)
                                 break;
@@ -956,6 +955,8 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                         res = &hose->io_resource;
                         res->flags = IORESOURCE_IO;
                         res->start = ranges[2];
+                        DBG("PCI: IO 0x%lx -> 0x%lx\n",
+                                    res->start, res->start + size - 1);
                         break;
                 case 2:         /* memory space */
                         memno = 0;
@@ -973,7 +974,11 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                         if (memno < 3) {
                                 res = &hose->mem_resources[memno];
                                 res->flags = IORESOURCE_MEM;
+                                if(ranges[0] & 0x40000000)
+                                        res->flags |= IORESOURCE_PREFETCH;
                                 res->start = ranges[na+2];
+                                DBG("PCI: MEM[%d] 0x%lx -> 0x%lx\n", memno,
+                                            res->start, res->start + size - 1);
                         }
                         break;
                 }
@@ -1806,6 +1811,23 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 EXPORT_SYMBOL(pci_iomap);
 EXPORT_SYMBOL(pci_iounmap);
 
+unsigned long pci_address_to_pio(phys_addr_t address)
+{
+        struct pci_controller* hose = hose_head;
+
+        for (; hose; hose = hose->next) {
+                unsigned int size = hose->io_resource.end -
+                        hose->io_resource.start + 1;
+                if (address >= hose->io_base_phys &&
+                    address < (hose->io_base_phys + size)) {
+                        unsigned long base =
+                                (unsigned long)hose->io_base_virt - _IO_BASE;
+                        return base + (address - hose->io_base_phys);
+                }
+        }
+        return (unsigned int)-1;
+}
+EXPORT_SYMBOL(pci_address_to_pio);
 
 /*
  * Null PCI config access functions, for the case when we can't