]> git.proxmox.com Git - mirror_qemu.git/commit
RISC-V: Check for the effective memory privilege mode during PMP checks
authorHesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
Thu, 30 May 2019 13:51:32 +0000 (14:51 +0100)
committerPalmer Dabbelt <palmer@sifive.com>
Mon, 24 Jun 2019 06:44:41 +0000 (23:44 -0700)
commitcc0fdb298517ce56c770803447f8b02a90271152
treef256b619745fc8f83120e57cd0da25287d279399
parent635b0b0ea39a13d1a3df932452e5728aebbb3f6e
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>
target/riscv/cpu_helper.c
target/riscv/pmp.c
target/riscv/pmp.h