GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Fix stored PC value when handling exceptions 

ARM processors save the PC value in the Link Register when they handle
and exception, but they store it with an added offset (depending on the
exception type). In order to make crashes easier to read and correctly
support more complicated handlers in libpayload, this patch adjusts the
saved PC value on exception entry to correct for that offset.

(Note: The value that we now store is what ARM calls the "preferred
return address". For most exceptions this is the faulting instruction,
but for software interrupts (SWI) it is the instruction after that. This
is the way most programs like GDB expect the stored PC address to work,
so let's leave it at that.)

Numbers taken from the Architecture Reference Manual at the end of
section B1.8.3.

BRANCH=none
BUG=chrome-os-partner:18390
TEST=Provoked a data abort and an undefined instruction in both coreboot
and depthcharge, confirmed that the PC address was spot on.

Original-Change-Id: Ia958a7edfcd4aa5e04c20148140a6148586935ba
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/199844
Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Original-Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
(cherry picked from commit 4a914d36bb181d090f75b1414158846d40dc9bac)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: Ib63ca973d5f037a879b4d4d258a4983160b67dd6
Reviewed-on: http://review.coreboot.org/7992
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
This commit is contained in:
Julius Werner 2014-05-14 14:53:18 -07:00 committed by Marc Jones
parent 739e6a84aa
commit 989e12bb63
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
payloads/libpayload/arch/arm/exception_asm.S
View File

@ -45,25 +45,44 @@ exception_table:
1: 1:
mov sp, $0 mov sp, $0
b exception_common b exception_common
/* Undefined Instruction (CAREFUL: the PC offset is specific to thumb mode!) */
2: 2:
sub lr, lr, $2
mov sp, $1 mov sp, $1
b exception_common b exception_common
/* Software Interrupt (no PC offset necessary) */
3: 3:
mov sp, $2 mov sp, $2
b exception_common b exception_common
/* Prefetch Abort */
4: 4:
sub lr, lr, $4
mov sp, $3 mov sp, $3
b exception_common b exception_common
/* Data Abort */
5: 5:
sub lr, lr, $8
mov sp, $4 mov sp, $4
b exception_common b exception_common
/* (not used) */
6: 6:
mov sp, $5 mov sp, $5
b exception_common b exception_common
/* Interrupt */
7: 7:
sub lr, lr, $4
mov sp, $6 mov sp, $6
b exception_common b exception_common
/* Fast Interrupt */
8: 8:
sub lr, lr, $4
mov sp, $7 mov sp, $7
b exception_common b exception_common

5
src/arch/arm/armv7/exception.c
View File

@ -81,6 +81,7 @@ static void print_regs(uint32_t *regs)
void exception_undefined_instruction(uint32_t *regs) void exception_undefined_instruction(uint32_t *regs)
{ {
printk(BIOS_ERR, "exception _undefined_instruction\n"); printk(BIOS_ERR, "exception _undefined_instruction\n");
regs[15] -= 2; /* CAREFUL: specific to thumb mode (otherwise 4)! */
print_regs(regs); print_regs(regs);
dump_stack(regs[13], 512); dump_stack(regs[13], 512);
die("exception"); die("exception");
@ -97,6 +98,7 @@ void exception_software_interrupt(uint32_t *regs)
void exception_prefetch_abort(uint32_t *regs) void exception_prefetch_abort(uint32_t *regs)
{ {
printk(BIOS_ERR, "exception _prefetch_abort\n"); printk(BIOS_ERR, "exception _prefetch_abort\n");
regs[15] -= 4;
print_regs(regs); print_regs(regs);
dump_stack(regs[13], 512); dump_stack(regs[13], 512);
die("exception"); die("exception");
@ -105,6 +107,7 @@ void exception_prefetch_abort(uint32_t *regs)
void exception_data_abort(uint32_t *regs) void exception_data_abort(uint32_t *regs)
{ {
printk(BIOS_ERR, "exception _data_abort\n"); printk(BIOS_ERR, "exception _data_abort\n");
regs[15] -= 8;
print_regs(regs); print_regs(regs);
dump_stack(regs[13], 512); dump_stack(regs[13], 512);
die("exception"); die("exception");
@ -121,6 +124,7 @@ void exception_not_used(uint32_t *regs)
void exception_irq(uint32_t *regs) void exception_irq(uint32_t *regs)
{ {
printk(BIOS_ERR, "exception _irq\n"); printk(BIOS_ERR, "exception _irq\n");
regs[15] -= 4;
print_regs(regs); print_regs(regs);
dump_stack(regs[13], 512); dump_stack(regs[13], 512);
die("exception"); die("exception");
@ -129,6 +133,7 @@ void exception_irq(uint32_t *regs)
void exception_fiq(uint32_t *regs) void exception_fiq(uint32_t *regs)
{ {
printk(BIOS_ERR, "exception _fiq\n"); printk(BIOS_ERR, "exception _fiq\n");
regs[15] -= 4;
print_regs(regs); print_regs(regs);
dump_stack(regs[13], 512); dump_stack(regs[13], 512);
die("exception"); die("exception");