diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-26 13:45:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-26 15:52:39 -0500 |
| commit | ef0b75d3d8afccebd3b9822de6bcae358d4bc0e3 (patch) | |
| tree | 9a1e0c04a8a3ecd641f0e219991eaf6ce98eefed /arch/riscv/lib/interrupts.c | |
| parent | 6b21502229035779059493b2193fd790448fe85e (diff) | |
| parent | 52923c6db7f00e0197ec894c8c1bb8a7681974bb (diff) | |
Merge git://git.denx.de/u-boot-riscv
Diffstat (limited to 'arch/riscv/lib/interrupts.c')
| -rw-r--r-- | arch/riscv/lib/interrupts.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index 0a0995a7af9..903a1c4cd55 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -12,7 +12,7 @@ #include <asm/system.h> #include <asm/encoding.h> -static void _exit_trap(int code, uint epc, struct pt_regs *regs); +static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs); int interrupt_init(void) { @@ -34,9 +34,9 @@ int disable_interrupts(void) return 0; } -uint handle_trap(uint mcause, uint epc, struct pt_regs *regs) +ulong handle_trap(ulong mcause, ulong epc, struct pt_regs *regs) { - uint is_int; + ulong is_int; is_int = (mcause & MCAUSE_INT); if ((is_int) && ((mcause & MCAUSE_CAUSE) == IRQ_M_EXT)) @@ -60,16 +60,33 @@ __attribute__((weak)) void timer_interrupt(struct pt_regs *regs) { } -static void _exit_trap(int code, uint epc, struct pt_regs *regs) +static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs) { static const char * const exception_code[] = { "Instruction address misaligned", "Instruction access fault", "Illegal instruction", "Breakpoint", - "Load address misaligned" + "Load address misaligned", + "Load access fault", + "Store/AMO address misaligned", + "Store/AMO access fault", + "Environment call from U-mode", + "Environment call from S-mode", + "Reserved", + "Environment call from M-mode", + "Instruction page fault", + "Load page fault", + "Reserved", + "Store/AMO page fault", }; - printf("exception code: %d , %s , epc %08x , ra %08lx\n", - code, exception_code[code], epc, regs->ra); + if (code < ARRAY_SIZE(exception_code)) { + printf("exception code: %ld , %s , epc %lx , ra %lx\n", + code, exception_code[code], epc, regs->ra); + } else { + printf("Reserved\n"); + } + + hang(); } |