arm64/sysreg: Convert ID_MMFR1_EL1 to automatic generation

Convert ID_MMFR1_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-19-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 f856fbf8bfdf83979ef7711b86877d04a45cf42e..e7e8400fc61f220db66d3f88fc1691ec0acb50ee 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_MMFR1_EL1               sys_reg(3, 0, 0, 1, 5)
 #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)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 5f22737681737ff488ac9c0405e1459a7f8fa4b6..2f1d0077afeda58a71534fb5b9320d9418a39f24 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -93,6 +93,55 @@ Enum 3:0     VMSA
 EndEnum
 EndSysreg
 
+Sysreg ID_MMFR1_EL1    3       0       0       1       5
+Res0   63:32
+Enum   31:28   BPred
+       0b0000  NI
+       0b0001  BP_SW_MANGED
+       0b0010  BP_ASID_AWARE
+       0b0011  BP_NOSNOOP
+       0b0100  BP_INVISIBLE
+EndEnum
+Enum   27:24   L1TstCln
+       0b0000  NI
+       0b0001  NOINVALIDATE
+       0b0010  INVALIDATE
+EndEnum
+Enum   23:20   L1Uni
+       0b0000  NI
+       0b0001  INVALIDATE
+       0b0010  CLEAN_AND_INVALIDATE
+EndEnum
+Enum   19:16   L1Hvd
+       0b0000  NI
+       0b0001  INVALIDATE_ISIDE_ONLY
+       0b0010  INVALIDATE
+       0b0011  CLEAN_AND_INVALIDATE
+EndEnum
+Enum   15:12   L1UniSW
+       0b0000  NI
+       0b0001  CLEAN
+       0b0010  CLEAN_AND_INVALIDATE
+       0b0011  INVALIDATE
+EndEnum
+Enum   11:8    L1HvdSW
+       0b0000  NI
+       0b0001  CLEAN_AND_INVALIDATE
+       0b0010  INVALIDATE_DSIDE_ONLY
+       0b0011  INVALIDATE
+EndEnum
+Enum   7:4     L1UniVA
+       0b0000  NI
+       0b0001  CLEAN_AND_INVALIDATE
+       0b0010  INVALIDATE_BP
+EndEnum
+Enum   3:0     L1HvdVA
+       0b0000  NI
+       0b0001  CLEAN_AND_INVALIDATE
+       0b0010  INVALIDATE_BP
+EndEnum
+EndSysreg
+
 Sysreg ID_AA64PFR0_EL1 3       0       0       4       0
 Enum   63:60   CSV3
        0b0000  NI