arm64/sysreg: Convert ID_PFR2_EL1 to automatic generation

Convert ID_PFR2_EL1 to be automatically generated as per DDI0487I.a,
no functional changes.

Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20221130171637.718182-32-james.morse@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 85197dd180e09a9e489a63bfb19023ee76fc5349..ccb64dc09a4e6e2968afe5b87c88ff20e939f331 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -165,7 +165,6 @@
 #define SYS_MPIDR_EL1                  sys_reg(3, 0, 0, 0, 5)
 #define SYS_REVIDR_EL1                 sys_reg(3, 0, 0, 0, 6)
 
-#define SYS_ID_PFR2_EL1                        sys_reg(3, 0, 0, 3, 4)
 #define SYS_ID_DFR0_EL1                        sys_reg(3, 0, 0, 1, 2)
 #define SYS_ID_DFR1_EL1                        sys_reg(3, 0, 0, 3, 5)
 #define SYS_ID_AFR0_EL1                        sys_reg(3, 0, 0, 1, 3)
@@ -694,9 +693,6 @@
 #define ID_DFR0_EL1_CopSDbg_SHIFT      4
 #define ID_DFR0_EL1_CopDbg_SHIFT       0
 
-#define ID_PFR2_EL1_SSBS_SHIFT         4
-#define ID_PFR2_EL1_CSV3_SHIFT         0
-
 #define MVFR0_EL1_FPRound_SHIFT                28
 #define MVFR0_EL1_FPShVec_SHIFT                24
 #define MVFR0_EL1_FPSqrt_SHIFT         20

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index e86193b295e4285d7cf4288460b4d9561f33c5c4..667428a8957882bb374fc68bf34723b1f9a86cfa 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -606,6 +606,22 @@ Enum       3:0     SpecSEI
 EndEnum
 EndSysreg
 
+Sysreg ID_PFR2_EL1     3       0       0       3       4
+Res0   63:12
+Enum   11:8    RAS_frac
+       0b0000  NI
+       0b0001  RASv1p1
+EndEnum
+Enum   7:4     SSBS
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   3:0     CSV3
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+EndSysreg
+
 Sysreg ID_AA64PFR0_EL1 3       0       0       4       0
 Enum   63:60   CSV3
        0b0000  NI