target/arm: Implement HCR_EL2.TTLBIS traps
For FEAT_EVT, the HCR_EL2.TTLBIS bit allows trapping on EL1 use of TLB maintenance instructions that operate on the inner shareable domain: AArch64: TLBI VMALLE1IS, TLBI VAE1IS, TLBI ASIDE1IS, TLBI VAAE1IS, TLBI VALE1IS, TLBI VAALE1IS, TLBI RVAE1IS, TLBI RVAAE1IS, TLBI RVALE1IS, and TLBI RVAALE1IS. AArch32: TLBIALLIS, TLBIMVAIS, TLBIASIDIS, TLBIMVAAIS, TLBIMVALIS, and TLBIMVAALIS. Add the trapping support. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
		
							parent
							
								
									d2fd931362
								
							
						
					
					
						commit
						0f66d223e3
					
				@ -362,6 +362,17 @@ static CPAccessResult access_ttlb(CPUARMState *env, const ARMCPRegInfo *ri,
 | 
			
		||||
    return CP_ACCESS_OK;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Check for traps from EL1 due to HCR_EL2.TTLB or TTLBIS. */
 | 
			
		||||
static CPAccessResult access_ttlbis(CPUARMState *env, const ARMCPRegInfo *ri,
 | 
			
		||||
                                    bool isread)
 | 
			
		||||
{
 | 
			
		||||
    if (arm_current_el(env) == 1 &&
 | 
			
		||||
        (arm_hcr_el2_eff(env) & (HCR_TTLB | HCR_TTLBIS))) {
 | 
			
		||||
        return CP_ACCESS_TRAP_EL2;
 | 
			
		||||
    }
 | 
			
		||||
    return CP_ACCESS_OK;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
 | 
			
		||||
{
 | 
			
		||||
    ARMCPU *cpu = env_archcpu(env);
 | 
			
		||||
@ -2206,16 +2217,16 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
 | 
			
		||||
static const ARMCPRegInfo v7mp_cp_reginfo[] = {
 | 
			
		||||
    /* 32 bit TLB invalidates, Inner Shareable */
 | 
			
		||||
    { .name = "TLBIALLIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 0,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbiall_is_write },
 | 
			
		||||
    { .name = "TLBIMVAIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 1,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbimva_is_write },
 | 
			
		||||
    { .name = "TLBIASIDIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 2,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbiasid_is_write },
 | 
			
		||||
    { .name = "TLBIMVAAIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 3,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbimvaa_is_write },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -4948,27 +4959,27 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
 | 
			
		||||
    /* TLBI operations */
 | 
			
		||||
    { .name = "TLBI_VMALLE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 0,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vmalle1is_write },
 | 
			
		||||
    { .name = "TLBI_VAE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 1,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vae1is_write },
 | 
			
		||||
    { .name = "TLBI_ASIDE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 2,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vmalle1is_write },
 | 
			
		||||
    { .name = "TLBI_VAAE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 3,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vae1is_write },
 | 
			
		||||
    { .name = "TLBI_VALE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 5,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vae1is_write },
 | 
			
		||||
    { .name = "TLBI_VAALE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 7,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_vae1is_write },
 | 
			
		||||
    { .name = "TLBI_VMALLE1", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 7, .opc2 = 0,
 | 
			
		||||
@ -5078,10 +5089,10 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
 | 
			
		||||
#endif
 | 
			
		||||
    /* TLB invalidate last level of translation table walk */
 | 
			
		||||
    { .name = "TLBIMVALIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 5,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbimva_is_write },
 | 
			
		||||
    { .name = "TLBIMVAALIS", .cp = 15, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 7,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlbis,
 | 
			
		||||
      .writefn = tlbimvaa_is_write },
 | 
			
		||||
    { .name = "TLBIMVAL", .cp = 15, .opc1 = 0, .crn = 8, .crm = 7, .opc2 = 5,
 | 
			
		||||
      .type = ARM_CP_NO_RAW, .access = PL1_W, .accessfn = access_ttlb,
 | 
			
		||||
@ -6726,19 +6737,19 @@ static const ARMCPRegInfo pauth_reginfo[] = {
 | 
			
		||||
static const ARMCPRegInfo tlbirange_reginfo[] = {
 | 
			
		||||
    { .name = "TLBI_RVAE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 2, .opc2 = 1,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_rvae1is_write },
 | 
			
		||||
    { .name = "TLBI_RVAAE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 2, .opc2 = 3,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_rvae1is_write },
 | 
			
		||||
   { .name = "TLBI_RVALE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 2, .opc2 = 5,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_rvae1is_write },
 | 
			
		||||
    { .name = "TLBI_RVAALE1IS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 2, .opc2 = 7,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlb, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .access = PL1_W, .accessfn = access_ttlbis, .type = ARM_CP_NO_RAW,
 | 
			
		||||
      .writefn = tlbi_aa64_rvae1is_write },
 | 
			
		||||
    { .name = "TLBI_RVAE1OS", .state = ARM_CP_STATE_AA64,
 | 
			
		||||
      .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 5, .opc2 = 1,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user