diff options
| -rw-r--r-- | arch/arm64/include/asm/sysreg.h | 4 | ||||
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 2 | 
2 files changed, 6 insertions, 0 deletions
| diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 638f6108860f..fa9d02ca4b25 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -670,7 +670,11 @@  #define ID_AA64PFR0_EL0_32BIT_64BIT	0x2  /* id_aa64pfr1 */ +#define ID_AA64PFR1_MPAMFRAC_SHIFT	16 +#define ID_AA64PFR1_RASFRAC_SHIFT	12 +#define ID_AA64PFR1_MTE_SHIFT		8  #define ID_AA64PFR1_SSBS_SHIFT		4 +#define ID_AA64PFR1_BT_SHIFT		0  #define ID_AA64PFR1_SSBS_PSTATE_NI	0  #define ID_AA64PFR1_SSBS_PSTATE_ONLY	1 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 68744871a65d..02f8e105cd68 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -238,6 +238,8 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = {  };  static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = { +	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_MPAMFRAC_SHIFT, 4, 0), +	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_RASFRAC_SHIFT, 4, 0),  	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_SSBS_SHIFT, 4, ID_AA64PFR1_SSBS_PSTATE_NI),  	ARM64_FTR_END,  }; | 
