arm64/sysreg: Convert ID_ISAR2_EL1 to automatic generation

Convert ID_ISAR2_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-25-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 d15edee3b1da69dec1797def427505851d30a3ea..f62d21a00da46019448df26356e96636e867ecbe 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_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)
 #define SYS_ID_ISAR5_EL1               sys_reg(3, 0, 0, 2, 5)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index d7c7949be47f5d95a5eaf77906661fc37e1582f9..9a7e5d0e63eb3946692e24eb75e1c908d9080a1e 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -298,6 +298,52 @@ Enum       3:0     Endian
 EndEnum
 EndSysreg
 
+Sysreg ID_ISAR2_EL1    3       0       0       2       2
+Res0   63:32
+Enum   31:28   Reversal
+       0b0000  NI
+       0b0001  REV
+       0b0010  RBIT
+EndEnum
+Enum   27:24   PSR_AR
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   23:20   MultU
+       0b0000  NI
+       0b0001  UMULL
+       0b0010  UMAAL
+EndEnum
+Enum   19:16   MultS
+       0b0000  NI
+       0b0001  SMULL
+       0b0010  SMLABB
+       0b0011  SMLAD
+EndEnum
+Enum   15:12   Mult
+       0b0000  NI
+       0b0001  MLA
+       0b0010  MLS
+EndEnum
+Enum   11:8    MultiAccessInt
+       0b0000  NI
+       0b0001  RESTARTABLE
+       0b0010  CONTINUABLE
+EndEnum
+Enum   7:4     MemHint
+       0b0000  NI
+       0b0001  PLD
+       0b0010  PLD2
+       0b0011  PLI
+       0b0100  PLDW
+EndEnum
+Enum   3:0     LoadStore
+       0b0000  NI
+       0b0001  DOUBLE
+       0b0010  ACQUIRE
+EndEnum
+EndSysreg
+
 Sysreg ID_MMFR4_EL1    3       0       0       2       6
 Res0   63:32
 Enum   31:28   EVT