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

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

Browse Source 
When menvcfg.HADE is 1, hardware updating of PTE A/D bits is enabled
during single-stage address translation. When the hypervisor extension is
implemented, if menvcfg.HADE is 1, hardware updating of PTE A/D bits is
enabled during G-stage address translation.

Set *envcfg.HADE 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-6-liweiwei@iscas.ac.cn>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Weiwei Li 2023-02-24 12:08:51 +08:00 committed by Palmer Dabbelt
parent 7a6613da99
commit 0af3f115e6
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/riscv/cpu.c
View File

@ -613,8 +613,10 @@ 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->menvcfg = (cpu->cfg.ext_svpbmt ? MENVCFG_PBMTE : 0) |
env->henvcfg = (cpu->cfg.ext_svpbmt ? HENVCFG_PBMTE : 0); (cpu->cfg.ext_svadu ? MENVCFG_HADE : 0);
env->henvcfg = (cpu->cfg.ext_svpbmt ? HENVCFG_PBMTE : 0) |
(cpu->cfg.ext_svadu ? HENVCFG_HADE : 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++) {

6
target/riscv/cpu_helper.c
View File

@ -937,9 +937,11 @@ restart:
} }
bool pbmte = env->menvcfg & MENVCFG_PBMTE; bool pbmte = env->menvcfg & MENVCFG_PBMTE;
bool hade = env->menvcfg & MENVCFG_HADE;
if (first_stage && two_stage && riscv_cpu_virt_enabled(env)) { if (first_stage && two_stage && riscv_cpu_virt_enabled(env)) {
pbmte = pbmte && (env->henvcfg & HENVCFG_PBMTE); pbmte = pbmte && (env->henvcfg & HENVCFG_PBMTE);
hade = hade && (env->henvcfg & HENVCFG_HADE);
} }
if (riscv_cpu_sxl(env) == MXL_RV32) { if (riscv_cpu_sxl(env) == MXL_RV32) {
@ -998,6 +1000,10 @@ restart:
/* Page table updates need to be atomic with MTTCG enabled */ /* Page table updates need to be atomic with MTTCG enabled */
if (updated_pte != pte) { if (updated_pte != pte) {
if (!hade) {
return TRANSLATE_FAIL;
}
/* /*
* - if accessed or dirty bits need updating, and the PTE is * - if accessed or dirty bits need updating, and the PTE is
* in RAM, then we do so atomically with a compare and swap. * in RAM, then we do so atomically with a compare and swap.