arm64/sysreg: Generate definitions for CLIDR_EL1

Convert CLIDR_EL1 to be automatically generated with definition as per
DDI0487H.a. No functional change.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220520161639.324236-2-broonie@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 91e4f8601393afb1166667707e0631f498697efa..0cea8bdb792fa8da076be045886f0b1dca56fcea 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -457,7 +457,6 @@
 #define SYS_CNTKCTL_EL1                        sys_reg(3, 0, 14, 1, 0)
 
 #define SYS_CCSIDR_EL1                 sys_reg(3, 1, 0, 0, 0)
-#define SYS_CLIDR_EL1                  sys_reg(3, 1, 0, 0, 1)
 #define SYS_GMID_EL1                   sys_reg(3, 1, 0, 0, 4)
 #define SYS_AIDR_EL1                   sys_reg(3, 1, 0, 0, 7)
 

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index a236d7a821b434b0b6b2f32bdb407e005aeed59b..0067d07f9125c6f92fb69023673c7f279c200d79 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -212,6 +212,22 @@ Sysreg     SMCR_EL1        3       0       1       2       6
 Fields SMCR_ELx
 EndSysreg
 
+Sysreg CLIDR_EL1       3       1       0       0       1
+Res0   63:47
+Field  46:33   Ttypen
+Field  32:30   ICB
+Field  29:27   LoUU
+Field  26:24   LoC
+Field  23:21   LoUIS
+Field  20:18   Ctype7
+Field  17:15   Ctype6
+Field  14:12   Ctype5
+Field  11:9    Ctype4
+Field  8:6     Ctype3
+Field  5:3     Ctype2
+Field  2:0     Ctype1
+EndSysreg
+
 Sysreg SMIDR_EL1       3       1       0       0       6
 Res0   63:32
 Field  31:24   IMPLEMENTER