[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 05/12] target/riscv: hardwire bits in hideleg and hedeleg
From: |
Alistair Francis |
Subject: |
[PULL v2 05/12] target/riscv: hardwire bits in hideleg and hedeleg |
Date: |
Thu, 15 Jul 2021 00:16:33 -0700 |
From: Jose Martins <josemartins90@gmail.com>
The specification mandates for certain bits to be hardwired in the
hypervisor delegation registers. This was not being enforced.
Signed-off-by: Jose Martins <josemartins90@gmail.com>
Reviewed-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20210522155902.374439-1-josemartins90@gmail.com
[ Changes by AF:
- Improve indentation
- Convert delegable_excps to a #define to avoid failures with GCC 8
]
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/csr.c | 54 ++++++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 62b968326c..9a4ed18ac5 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -411,28 +411,36 @@ static RISCVException read_timeh(CPURISCVState *env, int
csrno,
static const target_ulong delegable_ints = S_MODE_INTERRUPTS |
VS_MODE_INTERRUPTS;
+static const target_ulong vs_delegable_ints = VS_MODE_INTERRUPTS;
static const target_ulong all_ints = M_MODE_INTERRUPTS | S_MODE_INTERRUPTS |
VS_MODE_INTERRUPTS;
-static const target_ulong delegable_excps =
- (1ULL << (RISCV_EXCP_INST_ADDR_MIS)) |
- (1ULL << (RISCV_EXCP_INST_ACCESS_FAULT)) |
- (1ULL << (RISCV_EXCP_ILLEGAL_INST)) |
- (1ULL << (RISCV_EXCP_BREAKPOINT)) |
- (1ULL << (RISCV_EXCP_LOAD_ADDR_MIS)) |
- (1ULL << (RISCV_EXCP_LOAD_ACCESS_FAULT)) |
- (1ULL << (RISCV_EXCP_STORE_AMO_ADDR_MIS)) |
- (1ULL << (RISCV_EXCP_STORE_AMO_ACCESS_FAULT)) |
- (1ULL << (RISCV_EXCP_U_ECALL)) |
- (1ULL << (RISCV_EXCP_S_ECALL)) |
- (1ULL << (RISCV_EXCP_VS_ECALL)) |
- (1ULL << (RISCV_EXCP_M_ECALL)) |
- (1ULL << (RISCV_EXCP_INST_PAGE_FAULT)) |
- (1ULL << (RISCV_EXCP_LOAD_PAGE_FAULT)) |
- (1ULL << (RISCV_EXCP_STORE_PAGE_FAULT)) |
- (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT)) |
- (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT)) |
- (1ULL << (RISCV_EXCP_VIRT_INSTRUCTION_FAULT)) |
- (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT));
+#define DELEGABLE_EXCPS ((1ULL << (RISCV_EXCP_INST_ADDR_MIS)) | \
+ (1ULL << (RISCV_EXCP_INST_ACCESS_FAULT)) | \
+ (1ULL << (RISCV_EXCP_ILLEGAL_INST)) | \
+ (1ULL << (RISCV_EXCP_BREAKPOINT)) | \
+ (1ULL << (RISCV_EXCP_LOAD_ADDR_MIS)) | \
+ (1ULL << (RISCV_EXCP_LOAD_ACCESS_FAULT)) | \
+ (1ULL << (RISCV_EXCP_STORE_AMO_ADDR_MIS)) | \
+ (1ULL << (RISCV_EXCP_STORE_AMO_ACCESS_FAULT)) | \
+ (1ULL << (RISCV_EXCP_U_ECALL)) | \
+ (1ULL << (RISCV_EXCP_S_ECALL)) | \
+ (1ULL << (RISCV_EXCP_VS_ECALL)) | \
+ (1ULL << (RISCV_EXCP_M_ECALL)) | \
+ (1ULL << (RISCV_EXCP_INST_PAGE_FAULT)) | \
+ (1ULL << (RISCV_EXCP_LOAD_PAGE_FAULT)) | \
+ (1ULL << (RISCV_EXCP_STORE_PAGE_FAULT)) | \
+ (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT)) | \
+ (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT)) | \
+ (1ULL << (RISCV_EXCP_VIRT_INSTRUCTION_FAULT)) | \
+ (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT)))
+static const target_ulong vs_delegable_excps = DELEGABLE_EXCPS &
+ ~((1ULL << (RISCV_EXCP_S_ECALL)) |
+ (1ULL << (RISCV_EXCP_VS_ECALL)) |
+ (1ULL << (RISCV_EXCP_M_ECALL)) |
+ (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT)) |
+ (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT)) |
+ (1ULL << (RISCV_EXCP_VIRT_INSTRUCTION_FAULT)) |
+ (1ULL << (RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT)));
static const target_ulong sstatus_v1_10_mask = SSTATUS_SIE | SSTATUS_SPIE |
SSTATUS_UIE | SSTATUS_UPIE | SSTATUS_SPP | SSTATUS_FS | SSTATUS_XS |
SSTATUS_SUM | SSTATUS_MXR;
@@ -620,7 +628,7 @@ static RISCVException read_medeleg(CPURISCVState *env, int
csrno,
static RISCVException write_medeleg(CPURISCVState *env, int csrno,
target_ulong val)
{
- env->medeleg = (env->medeleg & ~delegable_excps) | (val & delegable_excps);
+ env->medeleg = (env->medeleg & ~DELEGABLE_EXCPS) | (val & DELEGABLE_EXCPS);
return RISCV_EXCP_NONE;
}
@@ -1039,7 +1047,7 @@ static RISCVException read_hedeleg(CPURISCVState *env,
int csrno,
static RISCVException write_hedeleg(CPURISCVState *env, int csrno,
target_ulong val)
{
- env->hedeleg = val;
+ env->hedeleg = val & vs_delegable_excps;
return RISCV_EXCP_NONE;
}
@@ -1053,7 +1061,7 @@ static RISCVException read_hideleg(CPURISCVState *env,
int csrno,
static RISCVException write_hideleg(CPURISCVState *env, int csrno,
target_ulong val)
{
- env->hideleg = val;
+ env->hideleg = val & vs_delegable_ints;
return RISCV_EXCP_NONE;
}
--
2.31.1
- [PULL v2 00/12] riscv-to-apply queue, Alistair Francis, 2021/07/15
- [PULL v2 01/12] target/riscv: pmp: Fix some typos, Alistair Francis, 2021/07/15
- [PULL v2 02/12] target/riscv: csr: Remove redundant check in fp csr read/write routines, Alistair Francis, 2021/07/15
- [PULL v2 03/12] docs/system: riscv: Fix CLINT name in the sifive_u doc, Alistair Francis, 2021/07/15
- [PULL v2 04/12] docs/system: riscv: Add documentation for virt machine, Alistair Francis, 2021/07/15
- [PULL v2 05/12] target/riscv: hardwire bits in hideleg and hedeleg,
Alistair Francis <=
- [PULL v2 06/12] docs/system: riscv: Update Microchip Icicle Kit for direct kernel boot, Alistair Francis, 2021/07/15
- [PULL v2 07/12] hw/riscv: sifive_u: Correct the CLINT timebase frequency, Alistair Francis, 2021/07/15
- [PULL v2 08/12] hw/riscv: sifive_u: Make sure firmware info is 8-byte aligned, Alistair Francis, 2021/07/15
- [PULL v2 09/12] char: ibex_uart: Update the register layout, Alistair Francis, 2021/07/15
- [PULL v2 11/12] hw/riscv: opentitan: Add the flash alias, Alistair Francis, 2021/07/15
- [PULL v2 10/12] hw/riscv: opentitan: Add the unimplement rv_core_ibex_peri, Alistair Francis, 2021/07/15
- [PULL v2 12/12] hw/riscv/boot: Check the error of fdt_pack(), Alistair Francis, 2021/07/15
- Re: [PULL v2 00/12] riscv-to-apply queue, Peter Maydell, 2021/07/16