[kvm-unit-tests PATCH v5 2/5] riscv: Update exception cause list

James Raphael Tiovalen
2024-07-28T16:50:35Z

Update the list of exception and interrupt causes to follow the latest
RISC-V privileged ISA specification (version 20240411 section 18.6.1).

Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
Signed-off-by: James Raphael Tiovalen <jamestiotio@gmail.com>
---
lib/riscv/asm/csr.h | 10 ++++++++++
lib/riscv/asm/processor.h | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/riscv/asm/csr.h b/lib/riscv/asm/csr.h
index d6909d93..ba810c9f 100644
--- a/lib/riscv/asm/csr.h
+++ b/lib/riscv/asm/csr.h
@@ -36,6 +36,16 @@
#define EXC_VIRTUAL_INST_FAULT 22
#define EXC_STORE_GUEST_PAGE_FAULT 23

+/* Interrupt causes */
+#define IRQ_S_SOFT 1
+#define IRQ_VS_SOFT 2
+#define IRQ_S_TIMER 5
+#define IRQ_VS_TIMER 6
+#define IRQ_S_EXT 9
+#define IRQ_VS_EXT 10
+#define IRQ_S_GEXT 12
+#define IRQ_PMU_OVF 13
+
#ifndef __ASSEMBLY__

#define csr_swap(csr, val) \
diff --git a/lib/riscv/asm/processor.h b/lib/riscv/asm/processor.h
index 6451adb5..4c9ad968 100644
--- a/lib/riscv/asm/processor.h
+++ b/lib/riscv/asm/processor.h
@@ -4,7 +4,7 @@
#include <asm/csr.h>
#include <asm/ptrace.h>

-#define EXCEPTION_CAUSE_MAX 16
+#define EXCEPTION_CAUSE_MAX 24
#define INTERRUPT_CAUSE_MAX 16

typedef void (*exception_fn)(struct pt_regs *);
--
2.43.0