diff options
| author | Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk> | 2019-05-30 14:51:32 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@sifive.com> | 2019-06-23 23:44:41 -0700 |
| commit | cc0fdb298517ce56c770803447f8b02a90271152 (patch) | |
| tree | f256b619745fc8f83120e57cd0da25287d279399 /target/riscv/pmp.h | |
| parent | 635b0b0ea39a13d1a3df932452e5728aebbb3f6e (diff) | |
RISC-V: Check for the effective memory privilege mode during PMP checks
The current PMP check function checks for env->priv which is not the effective
memory privilege mode.
For example, mstatus.MPRV could be set while executing in M-Mode, and in that
case the privilege mode for the PMP check should be S-Mode rather than M-Mode
(in env->priv) if mstatus.MPP == PRV_S.
This patch passes the effective memory privilege mode to the PMP check.
Functions that call the PMP check should pass the correct memory privilege mode
after reading mstatus' MPRV/MPP or hstatus.SPRV (if Hypervisor mode exists).
Suggested-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'target/riscv/pmp.h')
| -rw-r--r-- | target/riscv/pmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index 66790950eb..8e19793132 100644 --- a/target/riscv/pmp.h +++ b/target/riscv/pmp.h @@ -59,6 +59,6 @@ void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, target_ulong val); target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index); bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr, - target_ulong size, pmp_priv_t priv); + target_ulong size, pmp_priv_t priv, target_ulong mode); #endif |