yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-03 16:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: handle VMID change in secure state

Browse source 
The VTTBR write callback so far assumes that the underlying VM lies in
non-secure state. This handles the secure state scenario.

backports c4f060e89effd70ebdb23d3315495d33af377a09
This commit is contained in:
Rémi Denis-Courmont 2021-03-04 14:20:45 -05:00 committed by Lioncash
parent a78c31e36a
commit ce50ba6d07
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qemu/target/arm/helper.c
View file

@ -3710,10 +3710,15 @@ static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri,
* the combined stage 1&2 tlbs (EL10_1 and EL10_0). * the combined stage 1&2 tlbs (EL10_1 and EL10_0).
*/ */
if (raw_read(env, ri) != value) { if (raw_read(env, ri) != value) {
tlb_flush_by_mmuidx(cs, uint16_t mask = ARMMMUIdxBit_E10_1 |
ARMMMUIdxBit_E10_1 | ARMMMUIdxBit_E10_1_PAN |
ARMMMUIdxBit_E10_1_PAN | ARMMMUIdxBit_E10_0;
ARMMMUIdxBit_E10_0);
if (arm_is_secure_below_el3(env)) {
mask >>= ARM_MMU_IDX_A_NS;
}
tlb_flush_by_mmuidx(cs, mask);
raw_write(env, ri, value); raw_write(env, ri, value);
} }
} }