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

arm64/sysreg: Standardise naming for ID_DFR1_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_DFR1_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-13-james.morse@arm.com


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

arch/arm64/include/asm/sysreg.h

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ 
#define ID_ISAR4_EL1_WithShifts_SHIFT		4

#define ID_ISAR4_EL1_Unpriv_SHIFT		0



#define ID_DFR1_MTPMU_SHIFT		0

#define ID_DFR1_EL1_MTPMU_SHIFT		0



#define ID_ISAR0_EL1_Divide_SHIFT	24

#define ID_ISAR0_EL1_Debug_SHIFT	20

arch/arm64/kernel/cpufeature.c

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



static const struct arm64_ftr_bits ftr_id_dfr1[] = {

	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR1_MTPMU_SHIFT, 4, 0),

	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR1_EL1_MTPMU_SHIFT, 4, 0),

	ARM64_FTR_END,

};