target/riscv: Fix CSR perm checking for HS mode
Update the CSR permission checking to work correctly when we are in HS-mode. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com> Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
This commit is contained in:
parent
c7b1bbc80f
commit
0a42f4c440
|
@ -801,12 +801,22 @@ int riscv_csrrw(CPURISCVState *env, int csrno, target_ulong *ret_value,
|
||||||
|
|
||||||
/* check privileges and return -1 if check fails */
|
/* check privileges and return -1 if check fails */
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
int csr_priv = get_field(csrno, 0x300);
|
int effective_priv = env->priv;
|
||||||
int read_only = get_field(csrno, 0xC00) == 3;
|
int read_only = get_field(csrno, 0xC00) == 3;
|
||||||
if ((!env->debugger) && (env->priv < csr_priv)) {
|
|
||||||
return -1;
|
if (riscv_has_ext(env, RVH) &&
|
||||||
|
env->priv == PRV_S &&
|
||||||
|
!riscv_cpu_virt_enabled(env)) {
|
||||||
|
/*
|
||||||
|
* We are in S mode without virtualisation, therefore we are in HS Mode.
|
||||||
|
* Add 1 to the effective privledge level to allow us to access the
|
||||||
|
* Hypervisor CSRs.
|
||||||
|
*/
|
||||||
|
effective_priv++;
|
||||||
}
|
}
|
||||||
if (write_mask && read_only) {
|
|
||||||
|
if ((write_mask && read_only) ||
|
||||||
|
(!env->debugger && (effective_priv < get_field(csrno, 0x300)))) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue