Bit 19 (hardware error) must be writable in hedeleg, i.e. it must be
delegable. Add it DELEGABLE_EXCPS.
While we're at it, hedeleg bit 0 is only writable if IALIGN = 16, i.e.
RVC is enabled. Remove bit 0 from the delegation/writable mask if RVC
is enabled.
Fixes: bc083a51caff ("target/riscv: hardwire bits in hideleg and hedeleg")
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4592
Signed-off-by: Daniel Henrique Barboza <[email protected]>
---
target/riscv/tcg/csr.c | 11 +++++
tests/tcg/riscv64/system/meson.build | 7 ++++
tests/tcg/riscv64/test-hedeleg-write.S | 57 ++++++++++++++++++++++++++
3 files changed, 75 insertions(+)
create mode 100644 tests/tcg/riscv64/test-hedeleg-write.S
diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c
index af444e3e6f..9bea91113b 100644
--- a/target/riscv/tcg/csr.c
+++ b/target/riscv/tcg/csr.c
@@ -1837,6 +1837,7 @@ static const uint64_t all_ints = M_MODE_INTERRUPTS |
S_MODE_INTERRUPTS |
(1ULL << (RISCV_EXCP_LOAD_PAGE_FAULT)) | \
(1ULL << (RISCV_EXCP_STORE_PAGE_FAULT)) | \
(1ULL << (RISCV_EXCP_SW_CHECK)) | \
+ (1ULL << (RISCV_EXCP_HW_ERR)) | \
(1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT)) | \
(1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT)) | \
(1ULL << (RISCV_EXCP_VIRT_INSTRUCTION_FAULT)) | \
@@ -4913,6 +4914,16 @@ static RISCVException write_hedeleg(CPURISCVState *env,
int csrno,
target_ulong val, uintptr_t ra)
{
env->hedeleg = val & vs_delegable_excps;
+
+ /*
+ * delegable_excps includes bit 0, which is writable only if
+ * IALIGN = 32 (no RVC present). Ergo clear bit 0 if we have
+ * RVC.
+ */
+ if (riscv_has_ext(env, RVC)) {
+ env->hedeleg &= ~1ULL;
+ }
+
return RISCV_EXCP_NONE;
}
diff --git a/tests/tcg/riscv64/system/meson.build
b/tests/tcg/riscv64/system/meson.build
index 3c8b018d9e..502d1d80bc 100644
--- a/tests/tcg/riscv64/system/meson.build
+++ b/tests/tcg/riscv64/system/meson.build
@@ -89,6 +89,13 @@ tests += {
}
}
+tests += {
+ 'test-hedeleg-write.S': {
+ 'cflags': cflags,
+ 'qemu_args': ['-cpu', 'max', qemu_args],
+ }
+}
+
if 'qemu-system-riscv64' in emulators
tcg_tests += {
'riscv64-softmmu': {
diff --git a/tests/tcg/riscv64/test-hedeleg-write.S
b/tests/tcg/riscv64/test-hedeleg-write.S
new file mode 100644
index 0000000000..919de1fb3f
--- /dev/null
+++ b/tests/tcg/riscv64/test-hedeleg-write.S
@@ -0,0 +1,57 @@
+/*
+ * Test for writable hedeleg bits. Based on Gitlab 4592 testcase,
+ * which is derived from riscv-arch-test.
+ *
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#define HEDELEG_W_MASK 0xcb1fe
+
+.option norvc
+ .text
+ .global _start
+
+_start:
+ lla t0, trap
+ csrw mtvec, t0
+
+ /*
+ * Write a full 1 mask on hedeleg, read it back, see if
+ * all the expected bits were set.
+ */
+ addi t0, zero, -1
+ csrw hedeleg, t0
+ csrr t0, hedeleg
+ li t1, HEDELEG_W_MASK
+ bne t0, t1, _fail
+ li a0, 0
+ j _exit
+
+_fail:
+ li a0, 1
+ j _exit
+
+trap:
+ # Any trap is a fail code 1
+ li a0, 1
+
+# Exit code in a0
+_exit:
+ lla a1, semiargs
+ li t0, 0x20026 # ADP_Stopped_ApplicationExit
+ sd t0, 0(a1)
+ sd a0, 8(a1)
+ li a0, 0x20 # TARGET_SYS_EXIT_EXTENDED
+
+ # Semihosting call sequence
+ .balign 16
+ slli zero, zero, 0x1f
+ ebreak
+ srai zero, zero, 0x7
+ j .
+
+ .data
+ .balign 16
+semiargs:
+ .space 16
--
2.43.0