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: (24 commits)
  [POWERPC] Fix compile error with kexec and CONFIG_SMP=n
  [POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning
  [POWERPC] Fix warning in hpte_decode(), and generalize it
  [POWERPC] Minor pSeries IOMMU debug cleanup
  [POWERPC] PS3: Fix sys manager build error
  [POWERPC] Assorted janitorial EEH cleanups
  [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
  [POWERPC] pmu_sys_suspended is only defined for PPC32
  [POWERPC] Fix incorrect calculation of I/O window addresses
  [POWERPC] celleb: Update celleb_defconfig
  [POWERPC] celleb: Fix parsing of machine type hack command line option
  [POWERPC] celleb: Fix PCI config space accesses to subordinate buses
  [POWERPC] celleb: Fix support for multiple PCI domains
  [POWERPC] Wire up sys_utimensat
  [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning
  [POWERPC] User rheap from arch/powerpc/lib
  [POWERPC] 83xx: Fix the PCI ranges in the MPC834x_MDS device tree.
  [POWERPC] 83xx: Fix the PCI ranges in the MPC832x_MDS device tree.
  [POWERPC] CPM_UART: cpm_uart_set_termios should take ktermios, not termios
  [POWERPC] Change rheap functions to use ulongs instead of pointers
  ...

2 files changed, 44 insertions, 40 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 6d05a1f377b5..b0409e19b1c1 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -1098,35 +1098,24 @@ static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
                                 unsigned long *start_virt, unsigned long *size)
 {
         struct pci_controller *hose = pci_bus_to_host(bus);
-        struct pci_bus_region region;
         struct resource *res;
 
-        if (bus->self) {
+        if (bus->self)
                 res = bus->resource[0];
-                pcibios_resource_to_bus(bus->self, &region, res);
-                *start_phys = hose->io_base_phys + region.start;
-                *start_virt = (unsigned long) hose->io_base_virt + 
-                                region.start;
-                if (region.end > region.start) 
-                        *size = region.end - region.start + 1;
-                else {
-                        printk("%s(): unexpected region 0x%lx->0x%lx\n", 
-                                        __FUNCTION__, region.start, region.end);
-                        return 1;
-                }
-                
-        } else {
+        else
                 /* Root Bus */
                 res = &hose->io_resource;
-                *start_phys = hose->io_base_phys + res->start;
-                *start_virt = (unsigned long) hose->io_base_virt + res->start;
-                if (res->end > res->start)
-                        *size = res->end - res->start + 1;
-                else {
-                        printk("%s(): unexpected region 0x%lx->0x%lx\n", 
-                                        __FUNCTION__, res->start, res->end);
-                        return 1;
-                }
+
+        *start_virt = pci_io_base + res->start;
+        *start_phys = *start_virt + hose->io_base_phys
+                - (unsigned long) hose->io_base_virt;
+
+        if (res->end > res->start)
+                *size = res->end - res->start + 1;
+        else {
+                printk("%s(): unexpected region 0x%lx->0x%lx\n",
+                       __FUNCTION__, res->start, res->end);
+                return 1;
         }
 
         return 0;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index caef555f2dc0..c065b5550368 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -716,11 +716,40 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
         return 0;
 }
 
+#ifdef CONFIG_BLK_DEV_INITRD
+static void __init early_init_dt_check_for_initrd(unsigned long node)
+{
+        unsigned long l;
+        u32 *prop;
+
+        DBG("Looking for initrd properties... ");
+
+        prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l);
+        if (prop) {
+                initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4));
+
+                prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l);
+                if (prop) {
+                        initrd_end = (unsigned long)
+                                        __va(of_read_ulong(prop, l/4));
+                        initrd_below_start_ok = 1;
+                } else {
+                        initrd_start = 0;
+                }
+        }
+
+        DBG("initrd_start=0x%lx  initrd_end=0x%lx\n", initrd_start, initrd_end);
+}
+#else
+static inline void early_init_dt_check_for_initrd(unsigned long node)
+{
+}
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 static int __init early_init_dt_scan_chosen(unsigned long node,
                                             const char *uname, int depth, void *data)
 {
         unsigned long *lprop;
-        u32 *prop;
         unsigned long l;
         char *p;
 
@@ -762,21 +791,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
                crashk_res.end = crashk_res.start + *lprop - 1;
 #endif
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        DBG("Looking for initrd properties... ");
-        prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l);
-        if (prop) {
-                initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4));
-                prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l);
-                if (prop) {
-                        initrd_end = (unsigned long)__va(of_read_ulong(prop, l/4));
-                        initrd_below_start_ok = 1;
-                } else {
-                        initrd_start = 0;
-                }
-        }
-        DBG("initrd_start=0x%lx  initrd_end=0x%lx\n", initrd_start, initrd_end);
-#endif /* CONFIG_BLK_DEV_INITRD */
+        early_init_dt_check_for_initrd(node);
 
         /* Retreive command line */
         p = of_get_flat_dt_prop(node, "bootargs", &l);