13 files changed, 126 insertions, 111 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index e70d0483fb4e..b1eb834bc0fc 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1277,6 +1277,19 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_4xx,
                 .platform               = "ppc405",
         },
+        {
+                /* 405EZ */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x41510000,
+                .cpu_name               = "405EZ",
+                .cpu_features           = CPU_FTRS_40X,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .machine_check          = machine_check_4xx,
+                .platform               = "ppc405",
+        },
         {       /* default match */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 97e056379728..19671aca6591 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -30,6 +30,7 @@
 /* Stores the physical address of elf header of crash image. */
 unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
 
+#ifndef CONFIG_RELOCATABLE
 void __init reserve_kdump_trampoline(void)
 {
         lmb_reserve(0, KDUMP_RESERVE_LIMIT);
@@ -68,6 +69,7 @@ void __init setup_kdump_trampoline(void)
 
         DBG(" <- setup_kdump_trampoline()\n");
 }
+#endif /* CONFIG_RELOCATABLE */
 
 /*
  * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 84856bee33a5..69489bd3210c 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -97,6 +97,12 @@ __secondary_hold_spinloop:
 __secondary_hold_acknowledge:
         .llong  0x0
 
+        /* This flag is set by purgatory if we should be a kdump kernel. */
+        /* Do not move this variable as purgatory knows about it. */
+        .globl  __kdump_flag
+__kdump_flag:
+        .llong  0x0
+
 #ifdef CONFIG_PPC_ISERIES
         /*
          * At offset 0x20, there is a pointer to iSeries LPAR data.
@@ -1384,7 +1390,13 @@ _STATIC(__after_prom_start)
         /* process relocations for the final address of the kernel */
         lis     r25,PAGE_OFFSET@highest /* compute virtual base of kernel */
         sldi    r25,r25,32
-        mr      r3,r25
+#ifdef CONFIG_CRASH_DUMP
+        ld      r7,__kdump_flag-_stext(r26)
+        cmpldi  cr0,r7,1        /* kdump kernel ? - stay where we are */
+        bne     1f
+        add     r25,r25,r26
+#endif
+1:      mr      r3,r25
         bl      .relocate
 #endif
 
@@ -1398,11 +1410,26 @@ _STATIC(__after_prom_start)
         li      r3,0                    /* target addr */
         mr.     r4,r26                  /* In some cases the loader may  */
         beq     9f                      /* have already put us at zero */
-        lis     r5,(copy_to_here - _stext)@ha
-        addi    r5,r5,(copy_to_here - _stext)@l /* # bytes of memory to copy */
         li      r6,0x100                /* Start offset, the first 0x100 */
                                         /* bytes were copied earlier.    */
 
+#ifdef CONFIG_CRASH_DUMP
+/*
+ * Check if the kernel has to be running as relocatable kernel based on the
+ * variable __kdump_flag, if it is set the kernel is treated as relocatable
+ * kernel, otherwise it will be moved to PHYSICAL_START
+ */
+        ld      r7,__kdump_flag-_stext(r26)
+        cmpldi  cr0,r7,1
+        bne     3f
+
+        li      r5,__end_interrupts - _stext    /* just copy interrupts */
+        b       5f
+3:
+#endif
+        lis     r5,(copy_to_here - _stext)@ha
+        addi    r5,r5,(copy_to_here - _stext)@l /* # bytes of memory to copy */
+
         bl      .copy_and_flush         /* copy the first n bytes        */
                                         /* this includes the code being  */
                                         /* executed here.                */
@@ -1411,15 +1438,15 @@ _STATIC(__after_prom_start)
         mtctr   r8
         bctr
 
+p_end:  .llong  _end - _stext
+
 4:      /* Now copy the rest of the kernel up to _end */
         addis   r5,r26,(p_end - _stext)@ha
         ld      r5,(p_end - _stext)@l(r5)       /* get _end */
-        bl      .copy_and_flush         /* copy the rest */
+5:      bl      .copy_and_flush         /* copy the rest */
 
 9:      b       .start_here_multiplatform
 
-p_end:  .llong  _end - _stext
-
 /*
  * Copy routine used to copy the kernel to start at physical address 0
  * and flush and invalidate the caches as needed.
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index ea1ba89f9c90..3857d7e2af0c 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -458,6 +458,42 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
         spin_unlock_irqrestore(&(tbl->it_lock), flags);
 }
 
+static void iommu_table_clear(struct iommu_table *tbl)
+{
+        if (!__kdump_flag) {
+                /* Clear the table in case firmware left allocations in it */
+                ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);
+                return;
+        }
+
+#ifdef CONFIG_CRASH_DUMP
+        if (ppc_md.tce_get) {
+                unsigned long index, tceval, 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; freeing ");
+                        printk(KERN_WARNING "%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);
+                }
+        }
+#endif
+}
+
 /*
  * Build a iommu_table structure.  This contains a bit map which
  * is used to manage allocation of the tce space.
@@ -484,38 +520,7 @@ 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;
-                unsigned long 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
+        iommu_table_clear(tbl);
 
         if (!welcomed) {
                 printk(KERN_INFO "IOMMU table initialized, virtual merging %s\n",
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index aab76887a842..ac2a21f45c75 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -88,11 +88,13 @@ void __init reserve_crashkernel(void)
 
         crash_size = crashk_res.end - crashk_res.start + 1;
 
+#ifndef CONFIG_RELOCATABLE
         if (crashk_res.start != KDUMP_KERNELBASE)
                 printk("Crash kernel location must be 0x%x\n",
                                 KDUMP_KERNELBASE);
 
         crashk_res.start = KDUMP_KERNELBASE;
+#endif
         crash_size = PAGE_ALIGN(crash_size);
         crashk_res.end = crashk_res.start + crash_size - 1;
 
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index a168514d8609..e6efec788c4d 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -255,11 +255,14 @@ static union thread_union kexec_stack
 /* Our assembly helper, in kexec_stub.S */
 extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start,
                                         void *image, void *control,
-                                        void (*clear_all)(void)) ATTRIB_NORET;
+                                        void (*clear_all)(void),
+                                        unsigned long kdump_flag) ATTRIB_NORET;
 
 /* too late to fail here */
 void default_machine_kexec(struct kimage *image)
 {
+        unsigned long kdump_flag = 0;
+
         /* prepare control code if any */
 
         /*
@@ -270,8 +273,10 @@ void default_machine_kexec(struct kimage *image)
         * using debugger IPI.
         */
 
-       if (crashing_cpu == -1)
-               kexec_prepare_cpus();
+        if (crashing_cpu == -1)
+                kexec_prepare_cpus();
+        else
+                kdump_flag = KDUMP_SIGNATURE;
 
         /* switch to a staticly allocated stack.  Based on irq stack code.
          * XXX: the task struct will likely be invalid once we do the copy!
@@ -284,7 +289,7 @@ void default_machine_kexec(struct kimage *image)
          */
         kexec_sequence(&kexec_stack, image->start, image,
                         page_address(image->control_code_page),
-                        ppc_md.hpte_clear_all);
+                        ppc_md.hpte_clear_all, kdump_flag);
         /* NOTREACHED */
 }
 
@@ -312,11 +317,24 @@ static struct property kernel_end_prop = {
 static void __init export_htab_values(void)
 {
         struct device_node *node;
+        struct property *prop;
 
         node = of_find_node_by_path("/chosen");
         if (!node)
                 return;
 
+        /* remove any stale propertys so ours can be found */
+        prop = of_find_property(node, kernel_end_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+        prop = of_find_property(node, htab_base_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+        prop = of_find_property(node, htab_size_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+
+        /* information needed by userspace when using default_machine_kexec */
         kernel_end = __pa(_end);
         prom_add_property(node, &kernel_end_prop);
 
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 3053fe5c62f2..a243fd072a77 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -611,10 +611,12 @@ real_mode:	/* assume normal blr return */
 
 
 /*
- * kexec_sequence(newstack, start, image, control, clear_all())
+ * kexec_sequence(newstack, start, image, control, clear_all(), kdump_flag)
  *
  * does the grungy work with stack switching and real mode switches
  * also does simple calls to other code
+ *
+ * kdump_flag says whether the next kernel should be a kdump kernel.
  */
 
 _GLOBAL(kexec_sequence)
@@ -647,7 +649,7 @@ _GLOBAL(kexec_sequence)
         mr      r29,r5                  /* image (virt) */
         mr      r28,r6                  /* control, unused */
         mr      r27,r7                  /* clear_all() fn desc */
-        mr      r26,r8                  /* spare */
+        mr      r26,r8                  /* kdump flag */
         lhz     r25,PACAHWCPUID(r13)    /* get our phys cpu from paca */
 
         /* disable interrupts, we are overwriting kernel data next */
@@ -709,5 +711,6 @@ _GLOBAL(kexec_sequence)
         mr      r4,r30  # start, aka phys mem offset
         mtlr    4
         li      r5,0
-        blr     /* image->start(physid, image->start, 0); */
+        mr      r6,r26                  /* kdump_flag */
+        blr     /* image->start(physid, image->start, 0, kdump_flag); */
 #endif /* CONFIG_KEXEC */
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 3815d84a1ef4..1ec73938a00f 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -610,7 +610,8 @@ int pci_mmap_legacy_page_range(struct pci_bus *bus,
         pr_debug(" -> mapping phys %llx\n", (unsigned long long)offset);
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_page_prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
+        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
+                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
         return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                                vma->vm_end - vma->vm_start,
                                vma->vm_page_prot);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 2fdbc18ae94a..23e0db203329 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -487,67 +487,6 @@ static int __init prom_setprop(phandle node, const char *nodename,
         return call_prom("interpret", 1, 1, (u32)(unsigned long) cmd);
 }
 
-/* We can't use the standard versions because of RELOC headaches. */
-#define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
-                         || ('a' <= (c) && (c) <= 'f') \
-                         || ('A' <= (c) && (c) <= 'F'))
-
-#define isdigit(c)      ('0' <= (c) && (c) <= '9')
-#define islower(c)      ('a' <= (c) && (c) <= 'z')
-#define toupper(c)      (islower(c) ? ((c) - 'a' + 'A') : (c))
-
-unsigned long prom_strtoul(const char *cp, const char **endp)
-{
-        unsigned long result = 0, base = 10, value;
-
-        if (*cp == '0') {
-                base = 8;
-                cp++;
-                if (toupper(*cp) == 'X') {
-                        cp++;
-                        base = 16;
-                }
-        }
-
-        while (isxdigit(*cp) &&
-               (value = isdigit(*cp) ? *cp - '0' : toupper(*cp) - 'A' + 10) < base) {
-                result = result * base + value;
-                cp++;
-        }
-
-        if (endp)
-                *endp = cp;
-
-        return result;
-}
-
-unsigned long prom_memparse(const char *ptr, const char **retptr)
-{
-        unsigned long ret = prom_strtoul(ptr, retptr);
-        int shift = 0;
-
-        /*
-         * We can't use a switch here because GCC *may* generate a
-         * jump table which won't work, because we're not running at
-         * the address we're linked at.
-         */
-        if ('G' == **retptr || 'g' == **retptr)
-                shift = 30;
-
-        if ('M' == **retptr || 'm' == **retptr)
-                shift = 20;
-
-        if ('K' == **retptr || 'k' == **retptr)
-                shift = 10;
-
-        if (shift) {
-                ret <<= shift;
-                (*retptr)++;
-        }
-
-        return ret;
-}
-
 /*
  * Early parsing of the command line passed to the kernel, used for
  * "mem=x" and the options that affect the iommu
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 2c7e8e87f770..ea3a2ec03ffa 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush
 _end enter_prom memcpy memset reloc_offset __secondary_hold
 __secondary_hold_acknowledge __secondary_hold_spinloop __start
 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
-reloc_got2 kernstart_addr"
+reloc_got2 kernstart_addr memstart_addr"
 
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 5ec56ff03e86..705fc4bf3800 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -59,6 +59,7 @@
 #include <asm/mmu.h>
 #include <asm/xmon.h>
 #include <asm/cputhreads.h>
+#include <mm/mmu_decl.h>
 
 #include "setup.h"
 
@@ -190,6 +191,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 if (ppc_md.show_cpuinfo != NULL)
                         ppc_md.show_cpuinfo(m);
 
+#ifdef CONFIG_PPC32
+                /* Display the amount of memory */
+                seq_printf(m, "Memory\t\t: %d MB\n",
+                           (unsigned int)(total_memory / (1024 * 1024)));
+#endif
+
                 return 0;
         }
 
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 65ad925c3a8f..c6a8f2326b6f 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -235,8 +235,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         else
                 for (i = 0; i < 32 ; i++)
                         current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
-
-#else
 #endif
         return err;
 }
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index cb01ebc59387..7b7da8cfd5e8 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -142,7 +142,7 @@ unsigned int udbg_probe_uart_speed(void __iomem *comport, unsigned int clock)
         speed = (clock / prescaler) / (divisor * 16);
 
         /* sanity check */
-        if (speed < 0 || speed > (clock / 16))
+        if (speed > (clock / 16))
                 speed = 9600;
 
         return speed;