mirror of https://github.com/proxmox/mirror_qemu
target/arm: Always use arm_pan_enabled() when checking if PAN is enabled
Currently the code in target/arm/helper.c mostly checks the PAN bits in env->pstate or env->uncached_cpsr directly when it wants to know if PAN is enabled, because in most callsites we know whether we are in AArch64 or AArch32. We do have an arm_pan_enabled() function, but we only use it in a few places where the code might run in either an AArch32 or AArch64 context. For FEAT_NV, when HCR_EL2.{NV,NV1} is {1,1} PAN is always disabled even when the PSTATE.PAN bit is set, the "is PAN enabled" test becomes more complicated. Make all places that check for PAN use arm_pan_enabled(), so we have a place to put the FEAT_NV test. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Miguel Luis <miguel.luis@oracle.com>master
parent
ad4e2d4db1
commit
7fda076357
|
@ -263,6 +263,15 @@ void init_cpreg_list(ARMCPU *cpu)
|
|||
g_list_free(keys);
|
||||
}
|
||||
|
||||
static bool arm_pan_enabled(CPUARMState *env)
|
||||
{
|
||||
if (is_a64(env)) {
|
||||
return env->pstate & PSTATE_PAN;
|
||||
} else {
|
||||
return env->uncached_cpsr & CPSR_PAN;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Some registers are not accessible from AArch32 EL3 if SCR.NS == 0.
|
||||
*/
|
||||
|
@ -3614,7 +3623,7 @@ static void ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
|
|||
g_assert(ss != ARMSS_Secure); /* ARMv8.4-SecEL2 is 64-bit only */
|
||||
/* fall through */
|
||||
case 1:
|
||||
if (ri->crm == 9 && (env->uncached_cpsr & CPSR_PAN)) {
|
||||
if (ri->crm == 9 && arm_pan_enabled(env)) {
|
||||
mmu_idx = ARMMMUIdx_Stage1_E1_PAN;
|
||||
} else {
|
||||
mmu_idx = ARMMMUIdx_Stage1_E1;
|
||||
|
@ -3730,7 +3739,7 @@ static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri,
|
|||
case 0:
|
||||
switch (ri->opc1) {
|
||||
case 0: /* AT S1E1R, AT S1E1W, AT S1E1RP, AT S1E1WP */
|
||||
if (ri->crm == 9 && (env->pstate & PSTATE_PAN)) {
|
||||
if (ri->crm == 9 && arm_pan_enabled(env)) {
|
||||
mmu_idx = regime_e20 ?
|
||||
ARMMMUIdx_E20_2_PAN : ARMMMUIdx_Stage1_E1_PAN;
|
||||
} else {
|
||||
|
@ -12145,15 +12154,6 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate)
|
|||
}
|
||||
#endif
|
||||
|
||||
static bool arm_pan_enabled(CPUARMState *env)
|
||||
{
|
||||
if (is_a64(env)) {
|
||||
return env->pstate & PSTATE_PAN;
|
||||
} else {
|
||||
return env->uncached_cpsr & CPSR_PAN;
|
||||
}
|
||||
}
|
||||
|
||||
ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)
|
||||
{
|
||||
ARMMMUIdx idx;
|
||||
|
|
Loading…
Reference in New Issue