diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-05 08:24:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-05 08:24:50 -0500 |
| commit | a77a8fde7bb850178c2e4ad3db354b536114ea32 (patch) | |
| tree | b0f5072061ddd96a7611b11517a27dbecd69968d /arch/riscv/lib/interrupts.c | |
| parent | 9649c5343fb1e105109f8aac499134dd4bd723ca (diff) | |
| parent | 48cbf6246052de10d35b616b5efb2f783904a49d (diff) | |
Merge git://git.denx.de/u-boot-riscv
- Fix BBL may be corrupted problem.
- Support U-Boot run in S-mode.
Diffstat (limited to 'arch/riscv/lib/interrupts.c')
| -rw-r--r-- | arch/riscv/lib/interrupts.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index 903a1c4cd55..3aff0069773 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -34,17 +34,30 @@ int disable_interrupts(void) return 0; } -ulong handle_trap(ulong mcause, ulong epc, struct pt_regs *regs) +ulong handle_trap(ulong cause, ulong epc, struct pt_regs *regs) { - ulong is_int; + ulong is_irq, irq; - is_int = (mcause & MCAUSE_INT); - if ((is_int) && ((mcause & MCAUSE_CAUSE) == IRQ_M_EXT)) - external_interrupt(0); /* handle_m_ext_interrupt */ - else if ((is_int) && ((mcause & MCAUSE_CAUSE) == IRQ_M_TIMER)) - timer_interrupt(0); /* handle_m_timer_interrupt */ - else - _exit_trap(mcause, epc, regs); + is_irq = (cause & MCAUSE_INT); + irq = (cause & ~MCAUSE_INT); + + if (is_irq) { + switch (irq) { + case IRQ_M_EXT: + case IRQ_S_EXT: + external_interrupt(0); /* handle external interrupt */ + break; + case IRQ_M_TIMER: + case IRQ_S_TIMER: + timer_interrupt(0); /* handle timer interrupt */ + break; + default: + _exit_trap(cause, epc, regs); + break; + }; + } else { + _exit_trap(cause, epc, regs); + } return epc; } |