arm64/sysreg: Convert ID_ISAR3_EL1 to automatic generation

Convert ID_ISAR3_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-26-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 f62d21a..bfd69ab 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -173,7 +173,6 @@
 #define SYS_ID_AFR0_EL1                        sys_reg(3, 0, 0, 1, 3)
 #define SYS_ID_MMFR5_EL1               sys_reg(3, 0, 0, 3, 6)
 
-#define SYS_ID_ISAR3_EL1               sys_reg(3, 0, 0, 2, 3)
 #define SYS_ID_ISAR4_EL1               sys_reg(3, 0, 0, 2, 4)
 #define SYS_ID_ISAR5_EL1               sys_reg(3, 0, 0, 2, 5)
 #define SYS_ID_ISAR6_EL1               sys_reg(3, 0, 0, 2, 7)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 9a7e5d0..1e2d5a3 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -344,6 +344,44 @@ Enum       3:0     LoadStore
 EndEnum
 EndSysreg
 
+Sysreg ID_ISAR3_EL1    3       0       0       2       3
+Res0   63:32
+Enum   31:28   T32EE
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   27:24   TrueNOP
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   23:20   T32Copy
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   19:16   TabBranch
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   15:12   SynchPrim
+       0b0000  NI
+       0b0001  EXCLUSIVE
+       0b0010  DOUBLE
+EndEnum
+Enum   11:8    SVC
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   7:4     SIMD
+       0b0000  NI
+       0b0001  SSAT
+       0b0011  PKHBT
+EndEnum
+Enum   3:0     Saturate
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+EndSysreg
+
 Sysreg ID_MMFR4_EL1    3       0       0       2       6
 Res0   63:32
 Enum   31:28   EVT