mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/riscv: Add *envcfg.PBMTE related check in address translation

Browse Source 
menvcfg.PBMTE bit controls whether the Svpbmt extension is available
for use in S-mode and G-stage address translation.

henvcfg.PBMTE bit controls whether the Svpbmt extension is available
for use in VS-stage address translation.

Set *envcfg.PBMTE default true for backward compatibility.

Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-ID: <20230224040852.37109-5-liweiwei@iscas.ac.cn>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Weiwei Li 2023-02-24 12:08:50 +08:00 committed by Palmer Dabbelt
parent 0d190bd394
commit 7a6613da99
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/riscv/cpu.c
View File

@ -613,6 +613,9 @@ static void riscv_cpu_reset_hold(Object *obj)
env->bins = 0; env->bins = 0;
env->two_stage_lookup = false; env->two_stage_lookup = false;
env->menvcfg = (cpu->cfg.ext_svpbmt ? MENVCFG_PBMTE : 0);
env->henvcfg = (cpu->cfg.ext_svpbmt ? HENVCFG_PBMTE : 0);
/* Initialized default priorities of local interrupts. */ /* Initialized default priorities of local interrupts. */
for (i = 0; i < ARRAY_SIZE(env->miprio); i++) { for (i = 0; i < ARRAY_SIZE(env->miprio); i++) {
iprio = riscv_cpu_default_priority(i); iprio = riscv_cpu_default_priority(i);

10
target/riscv/cpu_helper.c
View File

@ -936,9 +936,15 @@ restart:
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} }
bool pbmte = env->menvcfg & MENVCFG_PBMTE;
if (first_stage && two_stage && riscv_cpu_virt_enabled(env)) {
pbmte = pbmte && (env->henvcfg & HENVCFG_PBMTE);
}
if (riscv_cpu_sxl(env) == MXL_RV32) { if (riscv_cpu_sxl(env) == MXL_RV32) {
ppn = pte >> PTE_PPN_SHIFT; ppn = pte >> PTE_PPN_SHIFT;
} else if (cpu->cfg.ext_svpbmt || cpu->cfg.ext_svnapot) { } else if (pbmte || cpu->cfg.ext_svnapot) {
ppn = (pte & (target_ulong)PTE_PPN_MASK) >> PTE_PPN_SHIFT; ppn = (pte & (target_ulong)PTE_PPN_MASK) >> PTE_PPN_SHIFT;
} else { } else {
ppn = pte >> PTE_PPN_SHIFT; ppn = pte >> PTE_PPN_SHIFT;
@ -950,7 +956,7 @@ restart:
if (!(pte & PTE_V)) { if (!(pte & PTE_V)) {
/* Invalid PTE */ /* Invalid PTE */
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (!cpu->cfg.ext_svpbmt && (pte & PTE_PBMT)) { } else if (!pbmte && (pte & PTE_PBMT)) {
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} else if (!(pte & (PTE_R | PTE_W | PTE_X))) { } else if (!(pte & (PTE_R | PTE_W | PTE_X))) {
/* Inner PTE, continue walking */ /* Inner PTE, continue walking */