SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Make the final stage1+2 write to secure be unconditional

Browse Source 
While the stage2 call to get_phys_addr_lpae should never set
attrs.secure when given a non-secure input, it's just as easy
to make the final update to attrs.secure be unconditional and
false in the case of non-secure input.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221007152159.1414065-1-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-10-07 08:21:59 -07:00 committed by Peter Maydell
parent c7637be307
commit 9b5ba97ac7
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/arm/ptw.c
View File

@ -2365,17 +2365,16 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
result->cacheattrs = combine_cacheattrs(env, cacheattrs1, result->cacheattrs = combine_cacheattrs(env, cacheattrs1,
result->cacheattrs); result->cacheattrs);
/* Check if IPA translates to secure or non-secure PA space. */ /*
if (is_secure) { * Check if IPA translates to secure or non-secure PA space.
if (ipa_secure) { * Note that VSTCR overrides VTCR and {N}SW overrides {N}SA.
*/
result->attrs.secure = result->attrs.secure =
!(env->cp15.vstcr_el2 & (VSTCR_SA | VSTCR_SW)); (is_secure
} else { && !(env->cp15.vstcr_el2 & (VSTCR_SA | VSTCR_SW))
result->attrs.secure = && (ipa_secure
!((env->cp15.vtcr_el2 & (VTCR_NSA | VTCR_NSW)) || !(env->cp15.vtcr_el2 & (VTCR_NSA | VTCR_NSW))));
|| (env->cp15.vstcr_el2 & (VSTCR_SA | VSTCR_SW)));
}
}
return 0; return 0;
} else { } else {
/* /*