Commit 356137e6 authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

arm64/sysreg: Make BHB clear feature defines match the architecture 



The architecture refers to the field identifying support for BHB clear as
BC but the kernel has called it CLEARBHB. In preparation for generation of
defines for ID_AA64ISAR2_EL1 rename to use the architecture's naming. No
functional changes.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220704170302.2609529-11-broonie@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 38e29671

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static inline bool supports_clearbhb(int scope) 
		isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1);



	return cpuid_feature_extract_unsigned_field(isar2,

						    ID_AA64ISAR2_CLEARBHB_SHIFT);

						    ID_AA64ISAR2_BC_SHIFT);

}



const struct cpumask *system_32bit_el0_cpumask(void);

arch/arm64/include/asm/sysreg.h

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ 
#define ID_AA64ISAR1_GPI_IMP			0x1



/* id_aa64isar2 */

#define ID_AA64ISAR2_CLEARBHB_SHIFT	28

#define ID_AA64ISAR2_BC_SHIFT		28

#define ID_AA64ISAR2_APA3_SHIFT		12

#define ID_AA64ISAR2_GPA3_SHIFT		8

#define ID_AA64ISAR2_RPRES_SHIFT	4

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { 
};



static const struct arm64_ftr_bits ftr_id_aa64isar2[] = {

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_CLEARBHB_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_BC_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),

		       FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_APA3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),