sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/riscv: Return from trap_handler instead of jumping out

Browse Source 
Change-Id: I8dbed5dbe377d3a02e58a3bc16a1ee112b28bea9
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-on: https://review.coreboot.org/21764
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Jonathan Neuschäfer
2017-11-24 23:12:15 +01:00
committed by Martin Roth
parent 3f75f5da42
commit b0de851ebb
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/arch/riscv/trap_handler.c
View File

@@ -69,7 +69,6 @@ void handle_supervisor_call(trapframe *tf) {
} }
tf->gpr[10] = returnValue; tf->gpr[10] = returnValue;
write_csr(mepc, read_csr(mepc) + 4); write_csr(mepc, read_csr(mepc) + 4);
asm volatile("j trap_return");
} }
static const char *const exception_names[] = { static const char *const exception_names[] = {
@@ -212,16 +211,16 @@ void trap_handler(trapframe *tf)
case CAUSE_MISALIGNED_LOAD: case CAUSE_MISALIGNED_LOAD:
print_trap_information(tf); print_trap_information(tf);
handle_misaligned_load(tf); handle_misaligned_load(tf);
break; return;
case CAUSE_MISALIGNED_STORE: case CAUSE_MISALIGNED_STORE:
print_trap_information(tf); print_trap_information(tf);
handle_misaligned_store(tf); handle_misaligned_store(tf);
break; return;
case CAUSE_SUPERVISOR_ECALL: case CAUSE_SUPERVISOR_ECALL:
/* Don't print so we make console putchar calls look /* Don't print so we make console putchar calls look
the way they should */ the way they should */
handle_supervisor_call(tf); handle_supervisor_call(tf);
break; return;
default: default:
printk(BIOS_EMERG, "================================\n"); printk(BIOS_EMERG, "================================\n");
printk(BIOS_EMERG, "coreboot: can not handle a trap:\n"); printk(BIOS_EMERG, "coreboot: can not handle a trap:\n");
@@ -264,7 +263,6 @@ void handle_misaligned_load(trapframe *tf) {
// return to where we came from // return to where we came from
write_csr(mepc, read_csr(mepc) + 4); write_csr(mepc, read_csr(mepc) + 4);
asm volatile("j trap_return");
} }
void handle_misaligned_store(trapframe *tf) { void handle_misaligned_store(trapframe *tf) {
@@ -292,5 +290,4 @@ void handle_misaligned_store(trapframe *tf) {
// return to where we came from // return to where we came from
write_csr(mepc, read_csr(mepc) + 4); write_csr(mepc, read_csr(mepc) + 4);
asm volatile("j trap_return");
} }

1
src/arch/riscv/trap_util.S
View File

@@ -141,7 +141,6 @@ trap_entry:
move a0,sp move a0,sp
jal trap_handler jal trap_handler
.global trap_return
trap_return: trap_return:
csrr a0, mscratch csrr a0, mscratch
restore_regs restore_regs