File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -1617,8 +1617,8 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu,
1617
1617
val &= ~ARM64_FEATURE_MASK (ID_AA64PFR1_EL1_MPAM_frac );
1618
1618
break ;
1619
1619
case SYS_ID_AA64PFR2_EL1 :
1620
- /* We only expose FPMR */
1621
- val &= ID_AA64PFR2_EL1_FPMR ;
1620
+ val &= ID_AA64PFR2_EL1_FPMR |
1621
+ ( kvm_has_mte ( vcpu -> kvm ) ? ID_AA64PFR2_EL1_MTEFAR : 0 ) ;
1622
1622
break ;
1623
1623
case SYS_ID_AA64ISAR1_EL1 :
1624
1624
if (!vcpu_has_ptrauth (vcpu ))
@@ -2876,7 +2876,9 @@ static const struct sys_reg_desc sys_reg_descs[] = {
2876
2876
ID_AA64PFR1_EL1_MPAM_frac |
2877
2877
ID_AA64PFR1_EL1_RAS_frac |
2878
2878
ID_AA64PFR1_EL1_MTE )),
2879
- ID_WRITABLE (ID_AA64PFR2_EL1 , ID_AA64PFR2_EL1_FPMR ),
2879
+ ID_WRITABLE (ID_AA64PFR2_EL1 ,
2880
+ ID_AA64PFR2_EL1_FPMR |
2881
+ ID_AA64PFR2_EL1_MTEFAR ),
2880
2882
ID_UNALLOCATED (4 ,3 ),
2881
2883
ID_WRITABLE (ID_AA64ZFR0_EL1 , ~ID_AA64ZFR0_EL1_RES0 ),
2882
2884
ID_HIDDEN (ID_AA64SMFR0_EL1 ),
You can’t perform that action at this time.
0 commit comments