Commit ed7c138d authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

arm64/sysreg: Standardise naming of ID_AA64MMFR0_EL1.BigEnd 



For some reason we refer to ID_AA64MMFR0_EL1.BigEnd as BIGENDEL. Remove the
EL from the name, bringing the naming into sync with DDI0487H.a. Due to the
large amount of MixedCase in this register which isn't really consistent
with either the kernel style or the majority of the architecture the use of
upper case is preserved. No functional changes.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarKristina Martsenko <kristina.martsenko@arm.com>
Link: https://lore.kernel.org/r/20220905225425.1871461-9-broonie@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 6ca2b9ca

arch/arm64/include/asm/cpufeature.h

+2 −2
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static inline s64 arm64_ftr_value(const struct arm64_ftr_bits *ftrp, u64 val) 


static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0)

{

	return cpuid_feature_extract_unsigned_field(mmfr0, ID_AA64MMFR0_EL1_BIGENDEL_SHIFT) == 0x1 ||

	return cpuid_feature_extract_unsigned_field(mmfr0, ID_AA64MMFR0_EL1_BIGEND_SHIFT) == 0x1 ||

		cpuid_feature_extract_unsigned_field(mmfr0, ID_AA64MMFR0_EL1_BIGENDEL0_SHIFT) == 0x1;

}
@@ -738,7 +738,7 @@ static inline bool system_supports_mixed_endian(void) 


	mmfr0 =	read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1);

	val = cpuid_feature_extract_unsigned_field(mmfr0,

						ID_AA64MMFR0_EL1_BIGENDEL_SHIFT);

						ID_AA64MMFR0_EL1_BIGEND_SHIFT);



	return val == 0x1;

}

arch/arm64/include/asm/sysreg.h

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ 
#define ID_AA64MMFR0_EL1_TGRAN16_SHIFT		20

#define ID_AA64MMFR0_EL1_BIGENDEL0_SHIFT	16

#define ID_AA64MMFR0_EL1_SNSMEM_SHIFT		12

#define ID_AA64MMFR0_EL1_BIGENDEL_SHIFT		8

#define ID_AA64MMFR0_EL1_BIGEND_SHIFT		8

#define ID_AA64MMFR0_EL1_ASID_SHIFT		4

#define ID_AA64MMFR0_EL1_PARANGE_SHIFT		0

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { 
	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EL1_BIGENDEL0_SHIFT, 4, 0),

	/* Linux shouldn't care about secure memory */

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EL1_SNSMEM_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EL1_BIGENDEL_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EL1_BIGEND_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EL1_ASID_SHIFT, 4, 0),

	/*

	 * Differing PARange is fine as long as all peripherals and memory are mapped

arch/arm64/kvm/hyp/include/nvhe/fixed_config.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
 * - Non-context synchronizing exception entry and exit

 */

#define PVM_ID_AA64MMFR0_ALLOW (\

	ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_BIGENDEL) | \

	ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_BIGEND) | \

	ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_SNSMEM) | \

	ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_BIGENDEL0) | \

	ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_EXS) \