arm64/sysreg: Convert ID_MMFR2_EL1 to automatic generation

Convert ID_MMFR2_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-20-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 e7e8400fc61f220db66d3f88fc1691ec0acb50ee..7e7e647a895c7ecdd6ad8d6f90c5e3cb71e5ab55 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -171,7 +171,6 @@
 #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)
-#define SYS_ID_MMFR2_EL1               sys_reg(3, 0, 0, 1, 6)
 #define SYS_ID_MMFR3_EL1               sys_reg(3, 0, 0, 1, 7)
 #define SYS_ID_MMFR4_EL1               sys_reg(3, 0, 0, 2, 6)
 #define SYS_ID_MMFR5_EL1               sys_reg(3, 0, 0, 3, 6)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 2f1d0077afeda58a71534fb5b9320d9418a39f24..df8b234eb7e94bc96a6e2bd4beb58a90e1881dca 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -142,6 +142,47 @@ Enum       3:0     L1HvdVA
 EndEnum
 EndSysreg
 
+Sysreg ID_MMFR2_EL1    3       0       0       1       6
+Res0   63:32
+Enum   31:28   HWAccFlg
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   27:24   WFIStall
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   23:20   MemBarr
+       0b0000  NI
+       0b0001  DSB_ONLY
+       0b0010  IMP
+EndEnum
+Enum   19:16   UniTLB
+       0b0000  NI
+       0b0001  BY_VA
+       0b0010  BY_MATCH_ASID
+       0b0011  BY_ALL_ASID
+       0b0100  OTHER_TLBS
+       0b0101  BROADCAST
+       0b0110  BY_IPA
+EndEnum
+Enum   15:12   HvdTLB
+       0b0000  NI
+EndEnum
+Enum   11:8    L1HvdRng
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   7:4     L1HvdBG
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+Enum   3:0     L1HvdFG
+       0b0000  NI
+       0b0001  IMP
+EndEnum
+EndSysreg
+
 Sysreg ID_AA64PFR0_EL1 3       0       0       4       0
 Enum   63:60   CSV3
        0b0000  NI