armv7: Support stack dump after exceptions

This patch enhances the armv7 exception handlers in Coreboot and
libpayload to show the correct SP and LR registers from the aborted
context, and also dump a part of the current stack. Since we cannot
access the banked registers of SVC mode from a different exception mode,
it changes Coreboot (and its payloads) to run in System mode instead. As
both modes can execute all privileged instructions, this should not have
any noticeable effect on firmware operation (please correct me if I'm
wrong!).

Change-Id: I0e04f47619e55308f7da4a3a99c9cae6ae35cc30
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/170045
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
(cherry picked from commit d0db2f5e938200e3f5899c5e1f1606ab2dd5b334)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6538
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

4 files changed, 38 insertions, 20 deletions

diff --git a/src/arch/armv7/bootblock.inc b/src/arch/armv7/bootblock.inc
index c45259db6dd6..b28a78783992 100644
--- a/src/arch/armv7/bootblock.inc
+++ b/src/arch/armv7/bootblock.inc
@@ -43,15 +43,12 @@ _cbfs_master_header:
 
 reset:
 	/*
-	 * Set the cpu to SVC32 mode and unmask aborts. Aborts might happen
-	 * before logging is turned on and may crash the machine, but at least
-	 * the problem will show up near the code that causes it.
+	 * Set the cpu to System mode with IRQ and FIQ disabled. Prefetch/Data
+	 * aborts may happen early and crash before the abort handlers are
+	 * installed, but at least the problem will show up near the code that
+	 * causes it.
 	 */
-	mrs	r0, cpsr
-	bic	r0, r0, #0x1f
-	orr	r0, r0, #0xd3
-	bic	r0, r0, #0x100
-	msr	cpsr_cxsf,r0
+	msr	cpsr_cxf, #0xdf
 
 	/*
 	 * From Cortex-A Series Programmer's Guide:
diff --git a/src/arch/armv7/exception.c b/src/arch/armv7/exception.c
index 1055cb5663c6..3b32e8bbb174 100644
--- a/src/arch/armv7/exception.c
+++ b/src/arch/armv7/exception.c
@@ -27,9 +27,10 @@
  * SUCH DAMAGE.
  */
 
-#include <console/console.h>
-#include <arch/exception.h>
 #include <stdint.h>
+#include <types.h>
+#include <arch/exception.h>
+#include <console/console.h>
 
 void exception_test(void);
 
@@ -43,20 +44,32 @@ void exception_not_used(uint32_t *);
 void exception_irq(uint32_t *);
 void exception_fiq(uint32_t *);
 
+static void dump_stack(uintptr_t addr, size_t bytes)
+{
+	int i, j;
+	const int line = 8;
+	uint32_t *ptr = (uint32_t *)(addr & ~(line * sizeof(*ptr) - 1));
+
+	printk(BIOS_ERR, "Dumping stack:\n");
+	for (i = bytes / sizeof(*ptr); i >= 0; i -= line) {
+		printk(BIOS_ERR, "%p: ", ptr + i);
+		for (j = i; j < i + line; j++)
+			printk(BIOS_ERR, "%08x ", *(ptr + j));
+		printk(BIOS_ERR, "\n");
+	}
+}
+
 static void print_regs(uint32_t *regs)
 {
 	int i;
-	/* Don't print the link register and stack pointer since we don't have their
-	 * actual value. They are hidden by the 'shadow' registers provided
-	 * by the trap hardware.
-	 */
+
 	for (i = 0; i < 16; i++) {
 		if (i == 15)
 			printk(BIOS_ERR, "PC");
 		else if (i == 14)
-			continue; /* LR */
+			printk(BIOS_ERR, "LR");
 		else if (i == 13)
-			continue; /* SP */
+			printk(BIOS_ERR, "SP");
 		else if (i == 12)
 			printk(BIOS_ERR, "IP");
 		else
@@ -69,6 +82,7 @@ void exception_undefined_instruction(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _undefined_instruction\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
@@ -76,6 +90,7 @@ void exception_software_interrupt(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _software_interrupt\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
@@ -83,6 +98,7 @@ void exception_prefetch_abort(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _prefetch_abort\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
@@ -94,6 +110,7 @@ void exception_data_abort(uint32_t *regs)
 	} else {
 		printk(BIOS_ERR, "exception _data_abort\n");
 		print_regs(regs);
+		dump_stack(regs[13], 512);
 	}
 	die("exception");
 }
@@ -102,6 +119,7 @@ void exception_not_used(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _not_used\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
@@ -109,6 +127,7 @@ void exception_irq(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _irq\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
@@ -116,6 +135,7 @@ void exception_fiq(uint32_t *regs)
 {
 	printk(BIOS_ERR, "exception _fiq\n");
 	print_regs(regs);
+	dump_stack(regs[13], 512);
 	die("exception");
 }
 
diff --git a/src/arch/armv7/exception_asm.S b/src/arch/armv7/exception_asm.S
index e46f4bcf6b67..163fdbd52a26 100644
--- a/src/arch/armv7/exception_asm.S
+++ b/src/arch/armv7/exception_asm.S
@@ -79,6 +79,7 @@ exception_common:
 	str	sp, exception_handler
 	ldr	sp, exception_stack_end
 	push	{ lr }
+	stmfd	sp, { sp, lr }^
 	sub	sp, sp, $8
 	push	{ r0 - r12 }
 	mov	r0, sp
@@ -86,7 +87,7 @@ exception_common:
 	ldr	pc, exception_handler
 	pop	{ r0 - r12 }
 	add	sp, sp, $8
-	ldm	sp!, { pc }^
+	ldmfd	sp!, { pc }^
 
 
 _undefined_instruction:	.word exception_undefined_instruction
diff --git a/src/arch/armv7/include/arch/cpu.h b/src/arch/armv7/include/arch/cpu.h
index df44a9244c54..52cc8a3f506f 100644
--- a/src/arch/armv7/include/arch/cpu.h
+++ b/src/arch/armv7/include/arch/cpu.h
@@ -98,10 +98,10 @@ inline static void sev(void)
 	asm volatile ("sev");
 }
 
-/* puts CPU into SVC32 mode and disable interrupts. */
-inline static void set_svc32_mode(void)
+/* puts CPU into System mode and disable interrupts. */
+inline static void set_system_mode(void)
 {
-	asm volatile("msr cpsr_c, %0" :: "r"(0x13 | 0xc0));
+	asm volatile("msr cpsr_c, %0" :: "r"(0x1f | 0xc0));
 }
 
 struct cpu_info *cpu_info(void);