21 files changed, 101 insertions, 100 deletions

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 3a87863d2876..d1ecc0f9ab58 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -7,6 +7,7 @@ choice
 
 config MPC8641_HPCN
         bool "Freescale MPC8641 HPCN"
+        select PPC_I8259
         help
           This option enables support for the MPC8641 HPCN board.
 
@@ -28,9 +29,4 @@ config PPC_INDIRECT_PCI_BE
         depends on PPC_86xx
         default y
 
-config PPC_STD_MMU
-        bool
-        depends on PPC_86xx
-        default y
-
 endmenu
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 7be796c5d5c9..476a6eeee710 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -2,9 +2,6 @@
 # Makefile for the PowerPC 86xx linux kernel.
 #
 
-
-ifeq ($(CONFIG_PPC_86xx),y)
 obj-$(CONFIG_SMP)               += mpc86xx_smp.o
-endif
 obj-$(CONFIG_MPC8641_HPCN)      += mpc86xx_hpcn.o
 obj-$(CONFIG_PCI)               += pci.o mpc86xx_pcie.o
diff --git a/arch/powerpc/platforms/86xx/mpc8641_hpcn.h b/arch/powerpc/platforms/86xx/mpc8641_hpcn.h
index 5042253758b7..5d2bcf78cef7 100644
--- a/arch/powerpc/platforms/86xx/mpc8641_hpcn.h
+++ b/arch/powerpc/platforms/86xx/mpc8641_hpcn.h
@@ -14,7 +14,6 @@
 #ifndef __MPC8641_HPCN_H__
 #define __MPC8641_HPCN_H__
 
-#include <linux/config.h>
 #include <linux/init.h>
 
 /* PCI interrupt controller */
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index ac7f41802e94..ebae73eb0063 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -12,7 +12,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index 9cca3d1a67f2..bb7fb41933ad 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -10,7 +10,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index 0d8b34089b96..bc5139043112 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -12,7 +12,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 352bbbacde9a..0c8c7b6ab897 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -6,6 +6,7 @@ config SPU_FS
         default m
         depends on PPC_CELL
         select SPU_BASE
+        select MEMORY_HOTPLUG
         help
           The SPU file system is used to access Synergistic Processing
           Units on machines implementing the Broadband Processor
@@ -18,7 +19,6 @@ config SPU_BASE
 config SPUFS_MMAP
         bool
         depends on SPU_FS && SPARSEMEM
-        select MEMORY_HOTPLUG
         default y
 
 config CBE_RAS
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 3d1831d331e5..00d112f92272 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -125,8 +125,6 @@ static void __init cell_init_early(void)
 {
         DBG(" -> cell_init_early()\n");
 
-        hpte_init_native();
-
         cell_init_iommu();
 
         ppc64_interrupt_controller = IC_CELL_PIC;
@@ -139,11 +137,17 @@ static int __init cell_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
-        if (of_flat_dt_is_compatible(root, "IBM,CBEA") ||
-            of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
-                return 1;
+        if (!of_flat_dt_is_compatible(root, "IBM,CBEA") &&
+            !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
+                return 0;
+
+#ifdef CONFIG_UDBG_RTAS_CONSOLE
+        udbg_init_rtas_console();
+#endif
+
+        hpte_init_native();
 
-        return 0;
+        return 1;
 }
 
 /*
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index db82f503ba2c..b306723abb87 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -168,12 +168,12 @@ spu_irq_class_0_bottom(struct spu *spu)
 
         stat &= mask;
 
-        if (stat & 1) /* invalid MFC DMA */
-                __spu_trap_invalid_dma(spu);
-
-        if (stat & 2) /* invalid DMA alignment */
+        if (stat & 1) /* invalid DMA alignment */
                 __spu_trap_dma_align(spu);
 
+        if (stat & 2) /* invalid MFC DMA */
+                __spu_trap_invalid_dma(spu);
+
         if (stat & 4) /* error on SPU */
                 __spu_trap_error(spu);
 
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 7854a380dce2..58e794f9da1b 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -204,7 +204,7 @@ static int spufs_cntl_mmap(struct file *file, struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_RESERVED;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
         vma->vm_ops = &spufs_cntl_mmap_vmops;
         return 0;
@@ -675,7 +675,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_RESERVED;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
         vma->vm_ops = &spufs_signal1_mmap_vmops;
         return 0;
@@ -762,7 +762,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
         /* FIXME: */
         vma->vm_flags |= VM_RESERVED;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
         vma->vm_ops = &spufs_signal2_mmap_vmops;
         return 0;
@@ -850,7 +850,7 @@ static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_RESERVED;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
         vma->vm_ops = &spufs_mss_mmap_vmops;
         return 0;
@@ -899,7 +899,7 @@ static int spufs_mfc_mmap(struct file *file, struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_RESERVED;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
         vma->vm_ops = &spufs_mfc_mmap_vmops;
         return 0;
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index b30e55dab832..015a51787009 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -464,7 +464,8 @@ static inline void wait_purge_complete(struct spu_state *csa, struct spu *spu)
          *     Poll MFC_CNTL[Ps] until value '11' is read
          *     (purge complete).
          */
-        POLL_WHILE_FALSE(in_be64(&priv2->mfc_control_RW) &
+        POLL_WHILE_FALSE((in_be64(&priv2->mfc_control_RW) &
+                         MFC_CNTL_PURGE_DMA_STATUS_MASK) ==
                          MFC_CNTL_PURGE_DMA_COMPLETE);
 }
 
@@ -1028,7 +1029,8 @@ static inline void wait_suspend_mfc_complete(struct spu_state *csa,
          * Restore, Step 47.
          *     Poll MFC_CNTL[Ss] until 11 is returned.
          */
-        POLL_WHILE_FALSE(in_be64(&priv2->mfc_control_RW) &
+        POLL_WHILE_FALSE((in_be64(&priv2->mfc_control_RW) &
+                         MFC_CNTL_SUSPEND_DMA_STATUS_MASK) ==
                          MFC_CNTL_SUSPEND_COMPLETE);
 }
 
@@ -2100,7 +2102,7 @@ EXPORT_SYMBOL_GPL(spu_save);
  * @spu: pointer to SPU iomem structure.
  *
  * Perform harvest + restore, as we may not be coming
- * from a previous succesful save operation, and the
+ * from a previous successful save operation, and the
  * hardware state is unknown.
  */
 int spu_restore(struct spu_state *new, struct spu *spu)
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index 30bdcf3925d9..ed44dfceaa45 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -242,13 +242,11 @@ static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va,
         local_irq_restore(flags);
 }
 
-void hpte_init_iSeries(void)
+void __init hpte_init_iSeries(void)
 {
         ppc_md.hpte_invalidate  = iSeries_hpte_invalidate;
         ppc_md.hpte_updatepp    = iSeries_hpte_updatepp;
         ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;
         ppc_md.hpte_insert      = iSeries_hpte_insert;
         ppc_md.hpte_remove      = iSeries_hpte_remove;
-
-        htab_finish_init();
 }
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 8ca7b9396355..2a9f81ea27d6 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -51,20 +51,21 @@ static unsigned lpEventHandlerPaths[HvLpEvent_Type_NumTypes];
 static struct HvLpEvent * get_next_hvlpevent(void)
 {
         struct HvLpEvent * event;
-        event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
+        event = (struct HvLpEvent *)hvlpevent_queue.hq_current_event;
 
         if (hvlpevent_is_valid(event)) {
                 /* rmb() needed only for weakly consistent machines (regatta) */
                 rmb();
                 /* Set pointer to next potential event */
-                hvlpevent_queue.xSlicCurEventPtr += ((event->xSizeMinus1 +
-                                LpEventAlign) / LpEventAlign) * LpEventAlign;
+                hvlpevent_queue.hq_current_event += ((event->xSizeMinus1 +
+                                IT_LP_EVENT_ALIGN) / IT_LP_EVENT_ALIGN) *
+                                        IT_LP_EVENT_ALIGN;
 
                 /* Wrap to beginning if no room at end */
-                if (hvlpevent_queue.xSlicCurEventPtr >
-                                hvlpevent_queue.xSlicLastValidEventPtr) {
-                        hvlpevent_queue.xSlicCurEventPtr =
-                                hvlpevent_queue.xSlicEventStackPtr;
+                if (hvlpevent_queue.hq_current_event >
+                                hvlpevent_queue.hq_last_event) {
+                        hvlpevent_queue.hq_current_event =
+                                hvlpevent_queue.hq_event_stack;
                 }
         } else {
                 event = NULL;
@@ -82,10 +83,10 @@ int hvlpevent_is_pending(void)
         if (smp_processor_id() >= spread_lpevents)
                 return 0;
 
-        next_event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
+        next_event = (struct HvLpEvent *)hvlpevent_queue.hq_current_event;
 
         return hvlpevent_is_valid(next_event) ||
-                hvlpevent_queue.xPlicOverflowIntPending;
+                hvlpevent_queue.hq_overflow_pending;
 }
 
 static void hvlpevent_clear_valid(struct HvLpEvent * event)
@@ -95,18 +96,18 @@ static void hvlpevent_clear_valid(struct HvLpEvent * event)
          * ie. on 64-byte boundaries.
          */
         struct HvLpEvent *tmp;
-        unsigned extra = ((event->xSizeMinus1 + LpEventAlign) /
-                                                 LpEventAlign) - 1;
+        unsigned extra = ((event->xSizeMinus1 + IT_LP_EVENT_ALIGN) /
+                                IT_LP_EVENT_ALIGN) - 1;
 
         switch (extra) {
         case 3:
-                tmp = (struct HvLpEvent*)((char*)event + 3 * LpEventAlign);
+                tmp = (struct HvLpEvent*)((char*)event + 3 * IT_LP_EVENT_ALIGN);
                 hvlpevent_invalidate(tmp);
         case 2:
-                tmp = (struct HvLpEvent*)((char*)event + 2 * LpEventAlign);
+                tmp = (struct HvLpEvent*)((char*)event + 2 * IT_LP_EVENT_ALIGN);
                 hvlpevent_invalidate(tmp);
         case 1:
-                tmp = (struct HvLpEvent*)((char*)event + 1 * LpEventAlign);
+                tmp = (struct HvLpEvent*)((char*)event + 1 * IT_LP_EVENT_ALIGN);
                 hvlpevent_invalidate(tmp);
         }
 
@@ -120,7 +121,7 @@ void process_hvlpevents(struct pt_regs *regs)
         struct HvLpEvent * event;
 
         /* If we have recursed, just return */
-        if (!spin_trylock(&hvlpevent_queue.lock))
+        if (!spin_trylock(&hvlpevent_queue.hq_lock))
                 return;
 
         for (;;) {
@@ -148,17 +149,17 @@ void process_hvlpevents(struct pt_regs *regs)
                                 printk(KERN_INFO "Unexpected Lp Event type=%d\n", event->xType );
 
                         hvlpevent_clear_valid(event);
-                } else if (hvlpevent_queue.xPlicOverflowIntPending)
+                } else if (hvlpevent_queue.hq_overflow_pending)
                         /*
                          * No more valid events. If overflow events are
                          * pending process them
                          */
-                        HvCallEvent_getOverflowLpEvents(hvlpevent_queue.xIndex);
+                        HvCallEvent_getOverflowLpEvents(hvlpevent_queue.hq_index);
                 else
                         break;
         }
 
-        spin_unlock(&hvlpevent_queue.lock);
+        spin_unlock(&hvlpevent_queue.hq_lock);
 }
 
 static int set_spread_lpevents(char *str)
@@ -184,20 +185,20 @@ void setup_hvlpevent_queue(void)
 {
         void *eventStack;
 
-        spin_lock_init(&hvlpevent_queue.lock);
+        spin_lock_init(&hvlpevent_queue.hq_lock);
 
         /* Allocate a page for the Event Stack. */
-        eventStack = alloc_bootmem_pages(LpEventStackSize);
-        memset(eventStack, 0, LpEventStackSize);
+        eventStack = alloc_bootmem_pages(IT_LP_EVENT_STACK_SIZE);
+        memset(eventStack, 0, IT_LP_EVENT_STACK_SIZE);
 
         /* Invoke the hypervisor to initialize the event stack */
-        HvCallEvent_setLpEventStack(0, eventStack, LpEventStackSize);
+        HvCallEvent_setLpEventStack(0, eventStack, IT_LP_EVENT_STACK_SIZE);
 
-        hvlpevent_queue.xSlicEventStackPtr = (char *)eventStack;
-        hvlpevent_queue.xSlicCurEventPtr = (char *)eventStack;
-        hvlpevent_queue.xSlicLastValidEventPtr = (char *)eventStack +
-                                        (LpEventStackSize - LpEventMaxSize);
-        hvlpevent_queue.xIndex = 0;
+        hvlpevent_queue.hq_event_stack = eventStack;
+        hvlpevent_queue.hq_current_event = eventStack;
+        hvlpevent_queue.hq_last_event = (char *)eventStack +
+                (IT_LP_EVENT_STACK_SIZE - IT_LP_EVENT_MAX_SIZE);
+        hvlpevent_queue.hq_index = 0;
 }
 
 /* Register a handler for an LpEvent type */
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index e68b6b5fa89f..c241413629ac 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -24,7 +24,6 @@
 #include <asm/processor.h>
 #include <asm/time.h>
 #include <asm/lppaca.h>
-#include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 
 #include "processor_vpd.h"
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 617c724c4590..66c77e4f8ec2 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -81,8 +81,6 @@ static void iSeries_pci_final_fixup(void) { }
 #endif
 
 extern int rd_size;             /* Defined in drivers/block/rd.c */
-extern unsigned long embedded_sysmap_start;
-extern unsigned long embedded_sysmap_end;
 
 extern unsigned long iSeries_recal_tb;
 extern unsigned long iSeries_recal_titan;
@@ -321,11 +319,6 @@ static void __init iSeries_init_early(void)
         iSeries_recal_titan = HvCallXm_loadTod();
 
         /*
-         * Initialize the hash table management pointers
-         */
-        hpte_init_iSeries();
-
-        /*
          * Initialize the DMA/TCE management
          */
         iommu_init_early_iSeries();
@@ -563,16 +556,6 @@ static void __init iSeries_fixup_klimit(void)
         if (naca.xRamDisk)
                 klimit = KERNELBASE + (u64)naca.xRamDisk +
                         (naca.xRamDiskSize * HW_PAGE_SIZE);
-        else {
-                /*
-                 * No ram disk was included - check and see if there
-                 * was an embedded system map.  Change klimit to take
-                 * into account any embedded system map
-                 */
-                if (embedded_sysmap_end)
-                        klimit = KERNELBASE + ((embedded_sysmap_end + 4095) &
-                                        0xfffffffffffff000);
-        }
 }
 
 static int __init iSeries_src_init(void)
@@ -683,6 +666,8 @@ static int __init iseries_probe(void)
          */
         virt_irq_max = 255;
 
+        hpte_init_iSeries();
+
         return 1;
 }
 
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index a0505ea48a86..4e32a5417fd1 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -199,11 +199,6 @@ static void __init maple_init_early(void)
 {
         DBG(" -> maple_init_early\n");
 
-        /* Initialize hash table, from now on, we can take hash faults
-         * and call ioremap
-         */
-        hpte_init_native();
-
         /* Setup interrupt mapping options */
         ppc64_interrupt_controller = IC_OPEN_PIC;
 
@@ -272,6 +267,8 @@ static int __init maple_probe(void)
          */
         alloc_dart_table();
 
+        hpte_init_native();
+
         return 1;
 }
 
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 9cc7db7a8bdc..89c5775f83be 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -600,13 +600,6 @@ pmac_halt(void)
  */
 static void __init pmac_init_early(void)
 {
-#ifdef CONFIG_PPC64
-        /* Initialize hash table, from now on, we can take hash faults
-         * and call ioremap
-         */
-        hpte_init_native();
-#endif
-
         /* Enable early btext debug if requested */
         if (strstr(cmd_line, "btextdbg")) {
                 udbg_adb_init_early();
@@ -683,6 +676,8 @@ static int __init pmac_probe(void)
          * part of the cacheable linar mapping
          */
         alloc_dart_table();
+
+        hpte_init_native();
 #endif
 
 #ifdef CONFIG_PPC32
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index 98c23aec85be..c37a8497c60f 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -287,7 +287,7 @@ void pci_addr_cache_remove_device(struct pci_dev *dev)
  * find the pci device that corresponds to a given address.
  * This routine scans all pci busses to build the cache.
  * Must be run late in boot process, after the pci controllers
- * have been scaned for devices (after all device resources are known).
+ * have been scanned for devices (after all device resources are known).
  */
 void __init pci_addr_cache_build(void)
 {
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index d03a8b078f9d..8cfb5706790e 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -92,6 +92,15 @@ static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages)
                 *(tcep++) = 0;
 }
 
+static unsigned long tce_get_pseries(struct iommu_table *tbl, long index)
+{
+        u64 *tcep;
+
+        index <<= TCE_PAGE_FACTOR;
+        tcep = ((u64 *)tbl->it_base) + index;
+
+        return *tcep;
+}
 
 static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
                                 long npages, unsigned long uaddr,
@@ -235,6 +244,25 @@ static void tce_freemulti_pSeriesLP(struct iommu_table *tbl, long tcenum, long n
         }
 }
 
+static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)
+{
+        u64 rc;
+        unsigned long tce_ret;
+
+        tcenum <<= TCE_PAGE_FACTOR;
+        rc = plpar_tce_get((u64)tbl->it_index, (u64)tcenum << 12, &tce_ret);
+
+        if (rc && printk_ratelimit()) {
+                printk("tce_get_pSeriesLP: plpar_tce_get failed. rc=%ld\n",
+                        rc);
+                printk("\tindex   = 0x%lx\n", (u64)tbl->it_index);
+                printk("\ttcenum  = 0x%lx\n", (u64)tcenum);
+                show_stack(current, (unsigned long *)__get_SP());
+        }
+
+        return tce_ret;
+}
+
 static void iommu_table_setparms(struct pci_controller *phb,
                                  struct device_node *dn,
                                  struct iommu_table *tbl)
@@ -254,7 +282,10 @@ static void iommu_table_setparms(struct pci_controller *phb,
         }
 
         tbl->it_base = (unsigned long)__va(*basep);
+
+#ifndef CONFIG_CRASH_DUMP
         memset((void *)tbl->it_base, 0, *sizep);
+#endif
 
         tbl->it_busno = phb->bus->number;
 
@@ -560,11 +591,13 @@ void iommu_init_early_pSeries(void)
                         ppc_md.tce_build = tce_build_pSeriesLP;
                         ppc_md.tce_free  = tce_free_pSeriesLP;
                 }
+                ppc_md.tce_get   = tce_get_pSeriesLP;
                 ppc_md.iommu_bus_setup = iommu_bus_setup_pSeriesLP;
                 ppc_md.iommu_dev_setup = iommu_dev_setup_pSeriesLP;
         } else {
                 ppc_md.tce_build = tce_build_pSeries;
                 ppc_md.tce_free  = tce_free_pSeries;
+                ppc_md.tce_get   = tce_get_pseries;
                 ppc_md.iommu_bus_setup = iommu_bus_setup_pSeries;
                 ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries;
         }
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 634b7d06d3cc..27480705996f 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -513,7 +513,7 @@ void pSeries_lpar_flush_hash_range(unsigned long number, int local)
                 spin_unlock_irqrestore(&pSeries_lpar_tlbie_lock, flags);
 }
 
-void hpte_init_lpar(void)
+void __init hpte_init_lpar(void)
 {
         ppc_md.hpte_invalidate  = pSeries_lpar_hpte_invalidate;
         ppc_md.hpte_updatepp    = pSeries_lpar_hpte_updatepp;
@@ -522,6 +522,4 @@ void hpte_init_lpar(void)
         ppc_md.hpte_remove      = pSeries_lpar_hpte_remove;
         ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
         ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
-
-        htab_finish_init();
 }
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 1e28518c6121..b3197ff156c6 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -322,11 +322,6 @@ static void __init pSeries_init_early(void)
         DBG(" -> pSeries_init_early()\n");
 
         fw_feature_init();
-        
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                hpte_init_lpar();
-        else
-                hpte_init_native();
 
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 find_udbg_vterm();
@@ -384,6 +379,11 @@ static int __init pSeries_probe_hypertas(unsigned long node,
         if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL) != NULL)
                 powerpc_firmware_features |= FW_FEATURE_LPAR;
 
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                hpte_init_lpar();
+        else
+                hpte_init_native();
+
         return 1;
 }