arm64/sysreg: Convert ID_ISAR1_EL1 to automatic generation

Convert ID_ISAR1_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-24-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 758f1c139c25fd586af692810ed56aa80f03c387..d15edee3b1da69dec1797def427505851d30a3ea 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_ISAR1_EL1               sys_reg(3, 0, 0, 2, 1)
 #define SYS_ID_ISAR2_EL1               sys_reg(3, 0, 0, 2, 2)
 #define SYS_ID_ISAR3_EL1               sys_reg(3, 0, 0, 2, 3)
 #define SYS_ID_ISAR4_EL1               sys_reg(3, 0, 0, 2, 4)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index bc1133af17460de25907487ec26df1d70149a8f8..d7c7949be47f5d95a5eaf77906661fc37e1582f9 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -259,6 +259,45 @@ Enum       3:0     Swap
 EndEnum
 EndSysreg
 
+Sysreg ID_ISAR1_EL1    3       0       0       2       1
+Res0   63:32
+Enum   31:28   Jazelle
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   27:24   Interwork
+       0b0000  NI
+       0b0001  BX
+       0b0010  BLX
+       0b0011  A32_BX
+EndEnum
+Enum   23:20   Immediate
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   19:16   IfThen
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   15:12   Extend
+       0b0000  NI
+       0b0001  SXTB
+       0b0010  SXTB16
+EndEnum
+Enum   11:8    Except_AR
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   7:4     Except
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   3:0     Endian
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+EndSysreg
+
 Sysreg ID_MMFR4_EL1    3       0       0       2       6
 Res0   63:32
 Enum   31:28   EVT