diff options
| author | Nikita Shubin | 2021-12-14 10:26:59 +0100 |
|---|---|---|
| committer | Alistair Francis | 2022-01-08 06:46:09 +0100 |
| commit | 0fbb5d2d3c9ded9fbd3f6f993974cc5e88e28912 (patch) | |
| tree | 62eab2af9a09fa7c68666bf586c2f95b4babd0e8 | |
| parent | Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu in... (diff) | |
| download | qemu-0fbb5d2d3c9ded9fbd3f6f993974cc5e88e28912.tar.gz qemu-0fbb5d2d3c9ded9fbd3f6f993974cc5e88e28912.tar.xz qemu-0fbb5d2d3c9ded9fbd3f6f993974cc5e88e28912.zip | |
target/riscv/pmp: fix no pmp illegal intrs
As per the privilege specification, any access from S/U mode should fail
if no pmp region is configured and pmp is present, othwerwise access
should succeed.
Fixes: d102f19a208 (target/riscv/pmp: Raise exception if no PMP entry is configured)
Signed-off-by: Nikita Shubin <n.shubin@yadro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20211214092659.15709-1-nikita.shubin@maquefel.me
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
| -rw-r--r-- | target/riscv/op_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index ee7c24efe7..58d992e98a 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -146,7 +146,8 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) uint64_t mstatus = env->mstatus; target_ulong prev_priv = get_field(mstatus, MSTATUS_MPP); - if (!pmp_get_num_rules(env) && (prev_priv != PRV_M)) { + if (riscv_feature(env, RISCV_FEATURE_PMP) && + !pmp_get_num_rules(env) && (prev_priv != PRV_M)) { riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } |