target/arm: refactor vae1_tlbmask()
Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20210112104511.36576-19-remi.denis.courmont@huawei.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
24179fea7e
commit
bc944d3a8b
|
@ -4470,26 +4470,23 @@ static CPAccessResult aa64_cacheop_pou_access(CPUARMState *env,
|
||||||
static int vae1_tlbmask(CPUARMState *env)
|
static int vae1_tlbmask(CPUARMState *env)
|
||||||
{
|
{
|
||||||
uint64_t hcr = arm_hcr_el2_eff(env);
|
uint64_t hcr = arm_hcr_el2_eff(env);
|
||||||
|
uint16_t mask;
|
||||||
|
|
||||||
if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
|
if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
|
||||||
uint16_t mask = ARMMMUIdxBit_E20_2 |
|
mask = ARMMMUIdxBit_E20_2 |
|
||||||
ARMMMUIdxBit_E20_2_PAN |
|
ARMMMUIdxBit_E20_2_PAN |
|
||||||
ARMMMUIdxBit_E20_0;
|
ARMMMUIdxBit_E20_0;
|
||||||
|
|
||||||
if (arm_is_secure_below_el3(env)) {
|
|
||||||
mask >>= ARM_MMU_IDX_A_NS;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mask;
|
|
||||||
} else if (arm_is_secure_below_el3(env)) {
|
|
||||||
return ARMMMUIdxBit_SE10_1 |
|
|
||||||
ARMMMUIdxBit_SE10_1_PAN |
|
|
||||||
ARMMMUIdxBit_SE10_0;
|
|
||||||
} else {
|
} else {
|
||||||
return ARMMMUIdxBit_E10_1 |
|
mask = 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return 56 if TBI is enabled, 64 otherwise. */
|
/* Return 56 if TBI is enabled, 64 otherwise. */
|
||||||
|
|
Loading…
Reference in a new issue