diff options
| author | Anup Patel | 2019-04-25 10:38:37 +0200 |
|---|---|---|
| committer | Palmer Dabbelt | 2019-05-17 05:42:11 +0200 |
| commit | 6dcaf00487ca10d87e53fc8decb2e30f113c955d (patch) | |
| tree | c29258bf0e09194fe983e03278fa106f22fb87a0 /arch/riscv/kernel | |
| parent | RISC-V: Use tabs to align macro values in asm/csr.h (diff) | |
| download | kernel-qcow2-linux-6dcaf00487ca10d87e53fc8decb2e30f113c955d.tar.gz kernel-qcow2-linux-6dcaf00487ca10d87e53fc8decb2e30f113c955d.tar.xz kernel-qcow2-linux-6dcaf00487ca10d87e53fc8decb2e30f113c955d.zip | |
RISC-V: Add interrupt related SCAUSE defines in asm/csr.h
This patch adds SCAUSE interrupt flag and SCAUSE interrupt related
defines to asm/csr.h. We also use these defines in kernel/irq.c and
express SIE/SIP flags in-terms of SCAUSE interrupt causes.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'arch/riscv/kernel')
| -rw-r--r-- | arch/riscv/kernel/irq.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c index c738132eecf8..6d8659388c49 100644 --- a/arch/riscv/kernel/irq.c +++ b/arch/riscv/kernel/irq.c @@ -14,17 +14,9 @@ /* * Possible interrupt causes: */ -#define INTERRUPT_CAUSE_SOFTWARE 1 -#define INTERRUPT_CAUSE_TIMER 5 -#define INTERRUPT_CAUSE_EXTERNAL 9 - -/* - * The high order bit of the trap cause register is always set for - * interrupts, which allows us to differentiate them from exceptions - * quickly. The INTERRUPT_CAUSE_* macros don't contain that bit, so we - * need to mask it off. - */ -#define INTERRUPT_CAUSE_FLAG (1UL << (__riscv_xlen - 1)) +#define INTERRUPT_CAUSE_SOFTWARE IRQ_S_SOFT +#define INTERRUPT_CAUSE_TIMER IRQ_S_TIMER +#define INTERRUPT_CAUSE_EXTERNAL IRQ_S_EXT int arch_show_interrupts(struct seq_file *p, int prec) { @@ -37,7 +29,7 @@ asmlinkage void __irq_entry do_IRQ(struct pt_regs *regs) struct pt_regs *old_regs = set_irq_regs(regs); irq_enter(); - switch (regs->scause & ~INTERRUPT_CAUSE_FLAG) { + switch (regs->scause & ~SCAUSE_IRQ_FLAG) { case INTERRUPT_CAUSE_TIMER: riscv_timer_interrupt(); break; |