RISC-V: Fix a PMP check with the correct access size

The PMP check should be of the memory access size rather
than TARGET_PAGE_SIZE.

Backports commit db21e6f72721996ddf1948c35a8ee35238089da4 from qemu
This commit is contained in:
Hesham Almatary 2019-08-08 16:57:00 -04:00 committed by Lioncash
parent e648455989
commit 39bfe52bc6
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -434,8 +434,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
if (riscv_feature(env, RISCV_FEATURE_PMP) &&
(ret == TRANSLATE_SUCCESS) &&
!pmp_hart_has_privs(env, pa, TARGET_PAGE_SIZE, 1 << access_type,
mode)) {
!pmp_hart_has_privs(env, pa, size, 1 << access_type, mode)) {
ret = TRANSLATE_PMP_FAIL;
}
if (ret == TRANSLATE_PMP_FAIL) {