arm64/sme: Automatically generate SMPRIMAP_EL2 definitions

No functional change should be seen from converting SMPRIMAP_EL2 to be
generated.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220510161208.631259-10-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 ce08a42637bc18c00f019417c698246cb3d3793d..2a9468d449faafba106f5651883028efc226282b 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -568,7 +568,6 @@
 #define SYS_ZCR_EL2                    sys_reg(3, 4, 1, 2, 0)
 #define SYS_TRFCR_EL2                  sys_reg(3, 4, 1, 2, 1)
 #define SYS_HCRX_EL2                   sys_reg(3, 4, 1, 2, 2)
-#define SYS_SMPRIMAP_EL2               sys_reg(3, 4, 1, 2, 5)
 #define SYS_DACR32_EL2                 sys_reg(3, 4, 3, 0, 0)
 #define SYS_HDFGRTR_EL2                        sys_reg(3, 4, 3, 1, 4)
 #define SYS_HDFGWTR_EL2                        sys_reg(3, 4, 3, 1, 5)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 1bf88ca3da5b8bb1d03742fb75ba913e407f13ac..2cdcdac0465e62a830a3f0afcfba2b8722a2c43d 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -206,6 +206,25 @@ Res0       14:12
 Field  11:0    AFFINITY
 EndSysreg
 
+Sysreg SMPRIMAP_EL2    3       4       1       2       5
+Field  63:60   P15
+Field  59:56   P14
+Field  55:52   P13
+Field  51:48   P12
+Field  47:44   P11
+Field  43:40   P10
+Field  39:36   F9
+Field  35:32   P8
+Field  31:28   P7
+Field  27:24   P6
+Field  23:20   P5
+Field  19:16   P4
+Field  15:12   P3
+Field  11:8    P2
+Field  7:4     P1
+Field  3:0     P0
+EndSysreg
+
 Sysreg SMCR_EL2        3       4       1       2       6
 Fields SMCR_ELx
 EndSysreg