On 12/4/25 12:04, Jim MacArthur wrote:
@@ -6121,8 +6131,16 @@ static void tcr2_el2_write(CPUARMState *env, const
ARMCPRegInfo *ri,
if (cpu_isar_feature(aa64_mec, cpu)) {
valid_mask |= TCR2_AMEC0 | TCR2_AMEC1;
}
+ if (cpu_isar_feature(aa64_asid2, cpu)) {
+ valid_mask |= TCR2_FNG1 | TCR2_FNG0 | TCR2_A2;
+ require_flush = true;
+ }
value &= valid_mask;
raw_write(env, ri, value);
+
+ if (require_flush) {
+ tlb_flush(CPU(cpu));
+ }
Just because A2 is valid doesn't mean the A2 bit changed.
Compare, for instance, vmsa_ttbr_write, where we notice if the ASID has changed before
performing the flush.
Note as well that we don't need to flush all tlbs. In tcr2_el1_write we know that we are
only affecting the EL1&0 regime (alle1_tlbmask). In tcr2_el2_write, we know that we are
only affecting the EL2&0 regime (see the E2H part of vae2_tlbmask).
r~