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

target/arm: Check V7VE as well as LPAE in arm_pamax

Browse Source 
In machvirt_init we create a cpu but do not fully initialize it.
Thus the propagation of V7VE to LPAE has not been done, and we
compute the wrong value for some v7 cpus, e.g. cortex-a15.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1078
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reported-by: He Zhe <zhe.he@windriver.com>
Message-id: 20220619001541.131672-3-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-06-18 17:15:41 -07:00 committed by Peter Maydell
parent 22536b1324
commit 59e1b8a22e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/arm/ptw.c
View File

@ -47,7 +47,13 @@ unsigned int arm_pamax(ARMCPU *cpu)
assert(parange < ARRAY_SIZE(pamax_map)); assert(parange < ARRAY_SIZE(pamax_map));
return pamax_map[parange]; return pamax_map[parange];
} }
if (arm_feature(&cpu->env, ARM_FEATURE_LPAE)) {
/*
* In machvirt_init, we call arm_pamax on a cpu that is not fully
* initialized, so we can't rely on the propagation done in realize.
*/
if (arm_feature(&cpu->env, ARM_FEATURE_LPAE) ||
arm_feature(&cpu->env, ARM_FEATURE_V7VE)) {
/* v7 with LPAE */ /* v7 with LPAE */
return 40; return 40;
} }