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

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (43 commits)
  [POWERPC] Use little-endian bit from firmware ibm,pa-features property
  [POWERPC] Make sure smp_processor_id works very early in boot
  [POWERPC] U4 DART improvements
  [POWERPC] todc: add support for Time-Of-Day-Clock
  [POWERPC] Make lparcfg.c work when both iseries and pseries are selected
  [POWERPC] Fix idr locking in init_new_context
  [POWERPC] mpc7448hpc2 (taiga) board config file
  [POWERPC] Add tsi108 pci and platform device data register function
  [POWERPC] Add general support for mpc7448hpc2 (Taiga) platform
  [POWERPC] Correct the MAX_CONTEXT definition
  powerpc: minor cleanups for mpc86xx
  [POWERPC] Make sure we select CONFIG_NEW_LEDS if ADB_PMU_LED is set
  [POWERPC] Simplify the code defining the 64-bit CPU features
  [POWERPC] powerpc: kconfig warning fix
  [POWERPC] Consolidate some of kernel/misc*.S
  [POWERPC] Remove unused function call_with_mmu_off
  [POWERPC] update asm-powerpc/time.h
  [POWERPC] Clean up it_lp_queue.h
  [POWERPC] Skip the "copy down" of the kernel if it is already at zero.
  [POWERPC] Add the use of the firmware soft-reset-nmi to kdump.
  ...

1 files changed, 30 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 7cb77c20fc5d..3d677ac99659 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -38,6 +38,7 @@
 #include <asm/iommu.h>
 #include <asm/pci-bridge.h>
 #include <asm/machdep.h>
+#include <asm/kdump.h>
 
 #define DBG(...)
 
@@ -440,8 +441,37 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
         tbl->it_largehint = tbl->it_halfpoint;
         spin_lock_init(&tbl->it_lock);
 
+#ifdef CONFIG_CRASH_DUMP
+        if (ppc_md.tce_get) {
+                unsigned long index, tceval;
+                unsigned long tcecount = 0;
+
+                /*
+                 * Reserve the existing mappings left by the first kernel.
+                 */
+                for (index = 0; index < tbl->it_size; index++) {
+                        tceval = ppc_md.tce_get(tbl, index + tbl->it_offset);
+                        /*
+                         * Freed TCE entry contains 0x7fffffffffffffff on JS20
+                         */
+                        if (tceval && (tceval != 0x7fffffffffffffffUL)) {
+                                __set_bit(index, tbl->it_map);
+                                tcecount++;
+                        }
+                }
+                if ((tbl->it_size - tcecount) < KDUMP_MIN_TCE_ENTRIES) {
+                        printk(KERN_WARNING "TCE table is full; ");
+                        printk(KERN_WARNING "freeing %d entries for the kdump boot\n",
+                                KDUMP_MIN_TCE_ENTRIES);
+                        for (index = tbl->it_size - KDUMP_MIN_TCE_ENTRIES;
+                                index < tbl->it_size; index++)
+                                __clear_bit(index, tbl->it_map);
+                }
+        }
+#else
         /* Clear the hardware table in case firmware left allocations in it */
         ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);
+#endif
 
         if (!welcomed) {
                 printk(KERN_INFO "IOMMU table initialized, virtual merging %s\n",