Commit 7b24177c authored by James Morse's avatar James Morse Committed by Will Deacon
Browse files

arm64/sysreg: Standardise naming for ID_MMFR5_EL1 



To convert the 32bit id registers to use the sysreg generation, they
must first have a regular pattern, to match the symbols the script
generates.

Ensure symbols for the ID_MMFR5_EL1 register have an _EL1 suffix.

No functional change.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20221130171637.718182-4-james.morse@arm.com


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

arch/arm64/include/asm/sysreg.h

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ 
#define ID_MMFR4_EL1_AC2_SHIFT		4

#define ID_MMFR4_EL1_SpecSEI_SHIFT	0



#define ID_MMFR5_ETS_SHIFT		0

#define ID_MMFR5_EL1_ETS_SHIFT		0



#define ID_PFR0_DIT_SHIFT		24

#define ID_PFR0_CSV2_SHIFT		16

arch/arm64/kernel/cpufeature.c

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



static const struct arm64_ftr_bits ftr_id_mmfr5[] = {

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

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

	ARM64_FTR_END,

};