1 files changed, 126 insertions, 7 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 5e1e5419722..3a2da7788cc 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -30,9 +30,10 @@
 #include <linux/uaccess.h>
 #include <linux/random.h>
 #include <linux/hw_breakpoint.h>
+#include <linux/cpuidle.h>
+#include <linux/console.h>
 
 #include <asm/cacheflush.h>
-#include <asm/leds.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/thread_notify.h>
@@ -62,6 +63,18 @@ static volatile int hlt_counter;
 
 #include <mach/system.h>
 
+#ifdef CONFIG_SMP
+void arch_trigger_all_cpu_backtrace(void)
+{
+        smp_send_all_cpu_backtrace();
+}
+#else
+void arch_trigger_all_cpu_backtrace(void)
+{
+        dump_stack();
+}
+#endif
+
 void disable_hlt(void)
 {
         hlt_counter++;
@@ -91,12 +104,33 @@ static int __init hlt_setup(char *__unused)
 __setup("nohlt", nohlt_setup);
 __setup("hlt", hlt_setup);
 
-void arm_machine_restart(char mode, const char *cmd)
+#ifdef CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART
+void arm_machine_flush_console(void)
 {
-        /* Disable interrupts first */
+        printk("\n");
+        pr_emerg("Restarting %s\n", linux_banner);
+        if (console_trylock()) {
+                console_unlock();
+                return;
+        }
+
+        mdelay(50);
+
         local_irq_disable();
-        local_fiq_disable();
+        if (!console_trylock())
+                pr_emerg("arm_restart: Console was locked! Busting\n");
+        else
+                pr_emerg("arm_restart: Console was locked!\n");
+        console_unlock();
+}
+#else
+void arm_machine_flush_console(void)
+{
+}
+#endif
 
+void arm_machine_restart(char mode, const char *cmd)
+{
         /*
          * Tell the mm system that we are going to reboot -
          * we may need it to insert some 1:1 mappings so that
@@ -182,8 +216,8 @@ void cpu_idle(void)
 
         /* endless idle loop with no priority at all */
         while (1) {
+                idle_notifier_call_chain(IDLE_START);
                 tick_nohz_stop_sched_tick(1);
-                leds_event(led_idle_start);
                 while (!need_resched()) {
 #ifdef CONFIG_HOTPLUG_CPU
                         if (cpu_is_offline(smp_processor_id()))
@@ -191,12 +225,16 @@ void cpu_idle(void)
 #endif
 
                         local_irq_disable();
+#ifdef CONFIG_PL310_ERRATA_769419
+                        wmb();
+#endif
                         if (hlt_counter) {
                                 local_irq_enable();
                                 cpu_relax();
                         } else {
                                 stop_critical_timings();
-                                pm_idle();
+                                if (cpuidle_idle_call())
+                                        pm_idle();
                                 start_critical_timings();
                                 /*
                                  * This will eventually be removed - pm_idle
@@ -207,8 +245,8 @@ void cpu_idle(void)
                                 local_irq_enable();
                         }
                 }
-                leds_event(led_idle_end);
                 tick_nohz_restart_sched_tick();
+                idle_notifier_call_chain(IDLE_END);
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
@@ -247,10 +285,89 @@ void machine_power_off(void)
 
 void machine_restart(char *cmd)
 {
+        /* Flush the console to make sure all the relevant messages make it
+         * out to the console drivers */
+        arm_machine_flush_console();
+
+        /* Disable interrupts first */
+        local_irq_disable();
+        local_fiq_disable();
+
         machine_shutdown();
         arm_pm_restart(reboot_mode, cmd);
 }
 
+/*
+ * dump a block of kernel memory from around the given address
+ */
+static void show_data(unsigned long addr, int nbytes, const char *name)
+{
+        int     i, j;
+        int     nlines;
+        u32     *p;
+
+        /*
+         * don't attempt to dump non-kernel addresses or
+         * values that are probably just small negative numbers
+         */
+        if (addr < PAGE_OFFSET || addr > -256UL)
+                return;
+
+        printk("\n%s: %#lx:\n", name, addr);
+
+        /*
+         * round address down to a 32 bit boundary
+         * and always dump a multiple of 32 bytes
+         */
+        p = (u32 *)(addr & ~(sizeof(u32) - 1));
+        nbytes += (addr & (sizeof(u32) - 1));
+        nlines = (nbytes + 31) / 32;
+
+
+        for (i = 0; i < nlines; i++) {
+                /*
+                 * just display low 16 bits of address to keep
+                 * each line of the dump < 80 characters
+                 */
+                printk("%04lx ", (unsigned long)p & 0xffff);
+                for (j = 0; j < 8; j++) {
+                        u32     data;
+                        if (probe_kernel_address(p, data)) {
+                                printk(" ********");
+                        } else {
+                                printk(" %08x", data);
+                        }
+                        ++p;
+                }
+                printk("\n");
+        }
+}
+
+static void show_extra_register_data(struct pt_regs *regs, int nbytes)
+{
+        mm_segment_t fs;
+
+        fs = get_fs();
+        set_fs(KERNEL_DS);
+        show_data(regs->ARM_pc - nbytes, nbytes * 2, "PC");
+        show_data(regs->ARM_lr - nbytes, nbytes * 2, "LR");
+        show_data(regs->ARM_sp - nbytes, nbytes * 2, "SP");
+        show_data(regs->ARM_ip - nbytes, nbytes * 2, "IP");
+        show_data(regs->ARM_fp - nbytes, nbytes * 2, "FP");
+        show_data(regs->ARM_r0 - nbytes, nbytes * 2, "R0");
+        show_data(regs->ARM_r1 - nbytes, nbytes * 2, "R1");
+        show_data(regs->ARM_r2 - nbytes, nbytes * 2, "R2");
+        show_data(regs->ARM_r3 - nbytes, nbytes * 2, "R3");
+        show_data(regs->ARM_r4 - nbytes, nbytes * 2, "R4");
+        show_data(regs->ARM_r5 - nbytes, nbytes * 2, "R5");
+        show_data(regs->ARM_r6 - nbytes, nbytes * 2, "R6");
+        show_data(regs->ARM_r7 - nbytes, nbytes * 2, "R7");
+        show_data(regs->ARM_r8 - nbytes, nbytes * 2, "R8");
+        show_data(regs->ARM_r9 - nbytes, nbytes * 2, "R9");
+        show_data(regs->ARM_r10 - nbytes, nbytes * 2, "R10");
+        set_fs(fs);
+}
+
 void __show_regs(struct pt_regs *regs)
 {
         unsigned long flags;
@@ -310,6 +427,8 @@ void __show_regs(struct pt_regs *regs)
                 printk("Control: %08x%s\n", ctrl, buf);
         }
 #endif
+
+        show_extra_register_data(regs, 128);
 }
 
 void show_regs(struct pt_regs * regs)