Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
  [POWERPC] Remove build warnings in windfarm_core
  [POWERPC] Pass per-file CFLAGs for platform specific op codes
  [POWERPC] Correct #endif comment
  [POWERPC] Fix ppc_rtas_progress_show()
  [POWERPC] Fix sed command lines for zlib source construction
  [POWERPC] Specify GNUTARGET on $(AR) invocations
  [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
  [POWERPC] Small fixes for the Ebony device tree
  [POWERPC] Fix warning on UP
  [POWERPC] cell_defconfig: Disable cpufreq and pmi
  [POWERPC] Fix IO space on PCI buses created from of_platform
  [POWERPC] Add spinlock to request_phb_iospace()
  [POWERPC] Fix make rules for treeImage.initrd
  [POWERPC] Remove warning in mpic.c
  [POWERPC] Update pasemi_defconfig
  [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
  [POWERPC] Update iseries_defconfig
  [POWERPC] Wire up some more syscalls
  [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
  [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
  ...

1 files changed, 22 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index b0409e19b1c..249cca27a9b 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -41,6 +41,7 @@
 
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
+static int pci_initial_scan_done;
 
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
@@ -604,6 +605,8 @@ static int __init pcibios_init(void)
                 /* map in PCI I/O space */
                 phbs_remap_io();
 
+        pci_initial_scan_done = 1;
+
         printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
         return 0;
@@ -1042,13 +1045,16 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
         }
 }
 
-void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
+void __devinit pci_setup_phb_io(struct pci_controller *hose, int primary)
 {
         unsigned long size = hose->pci_io_size;
         unsigned long io_virt_offset;
         struct resource *res;
         struct device_node *isa_dn;
 
+        if (size == 0)
+                return;
+
         hose->io_base_virt = reserve_phb_iospace(size);
         DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
                 hose->global_number, hose->io_base_phys,
@@ -1069,6 +1075,15 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
         res = &hose->io_resource;
         res->start += io_virt_offset;
         res->end += io_virt_offset;
+
+        /* If this is called after the initial PCI scan, then we need to
+         * proceed to IO mappings now
+         */
+        if (pci_initial_scan_done)
+                __ioremap_explicit(hose->io_base_phys,
+                                   (unsigned long)hose->io_base_virt,
+                                   hose->pci_io_size,
+                                   _PAGE_NO_CACHE | _PAGE_GUARDED);
 }
 
 void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
@@ -1078,6 +1093,9 @@ void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
         unsigned long io_virt_offset;
         struct resource *res;
 
+        if (size == 0)
+                return;
+
         hose->io_base_virt = __ioremap(hose->io_base_phys, size,
                                         _PAGE_NO_CACHE | _PAGE_GUARDED);
         DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
@@ -1106,6 +1124,9 @@ static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
                 /* Root Bus */
                 res = &hose->io_resource;
 
+        if (res->end == 0 && res->start == 0)
+                return 1;
+
         *start_virt = pci_io_base + res->start;
         *start_phys = *start_virt + hose->io_base_phys
                 - (unsigned long) hose->io_base_virt;