]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
arm64/sysreg: Standardise naming for ID_PFR0_EL1
authorJames Morse <james.morse@arm.com>
Wed, 30 Nov 2022 17:16:07 +0000 (17:16 +0000)
committerWill Deacon <will@kernel.org>
Thu, 1 Dec 2022 15:53:13 +0000 (15:53 +0000)
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_PFR0_EL1 register have an _EL1 suffix,
and use lower case in feature names where the arm-arm does the same.

No functional change.

Signed-off-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20221130171637.718182-9-james.morse@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/sysreg.h
arch/arm64/kernel/cpufeature.c

index 10a00b21985138d32ad2e1e8fd508214e5691ceb..6b4975132db950feaab772ca8126cd186da061a8 100644 (file)
 
 #define ID_MMFR5_EL1_ETS_SHIFT         0
 
-#define ID_PFR0_DIT_SHIFT              24
-#define ID_PFR0_CSV2_SHIFT             16
-#define ID_PFR0_STATE3_SHIFT           12
-#define ID_PFR0_STATE2_SHIFT           8
-#define ID_PFR0_STATE1_SHIFT           4
-#define ID_PFR0_STATE0_SHIFT           0
+#define ID_PFR0_EL1_DIT_SHIFT          24
+#define ID_PFR0_EL1_CSV2_SHIFT         16
+#define ID_PFR0_EL1_State3_SHIFT       12
+#define ID_PFR0_EL1_State2_SHIFT       8
+#define ID_PFR0_EL1_State1_SHIFT       4
+#define ID_PFR0_EL1_State0_SHIFT       0
 
 #define ID_DFR0_PERFMON_SHIFT          24
 #define ID_DFR0_MPROFDBG_SHIFT         20
index 63ecad8f173012b3d534a682ba49c2800d02090b..11e84a4f8b9707a93618500214740a11b5e1cbff 100644 (file)
@@ -538,12 +538,12 @@ static const struct arm64_ftr_bits ftr_id_isar6[] = {
 };
 
 static const struct arm64_ftr_bits ftr_id_pfr0[] = {
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_DIT_SHIFT, 4, 0),
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_PFR0_CSV2_SHIFT, 4, 0),
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE3_SHIFT, 4, 0),
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE2_SHIFT, 4, 0),
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE1_SHIFT, 4, 0),
-       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE0_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_DIT_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_CSV2_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_State3_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_State2_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_State1_SHIFT, 4, 0),
+       ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_EL1_State0_SHIFT, 4, 0),
        ARM64_FTR_END,
 };