arm64/sme: Generate defintions for SVCR

Convert SVCR to automatic generation, 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/20220510161208.631259-12-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 b4affc3fd5697e1a99ae2f207e4a072778e7286d..804b5326c3938b35e9f94a895043af4061e04acc 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -474,10 +474,6 @@
 #define SYS_RNDR_EL0                   sys_reg(3, 3, 2, 4, 0)
 #define SYS_RNDRRS_EL0                 sys_reg(3, 3, 2, 4, 1)
 
-#define SYS_SVCR                       sys_reg(3, 3, 4, 2, 2)
-#define SVCR_ZA_MASK                   2
-#define SVCR_SM_MASK                   1
-
 #define SYS_PMCR_EL0                   sys_reg(3, 3, 9, 12, 0)
 #define SYS_PMCNTENSET_EL0             sys_reg(3, 3, 9, 12, 1)
 #define SYS_PMCNTENCLR_EL0             sys_reg(3, 3, 9, 12, 2)

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index d29bc429f5048c8a9db02b7c4f8dc7b21c7f6643..7888603db50a98d4e46d643ed269b66d3ffc967e 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -211,6 +211,12 @@ Res0       14:12
 Field  11:0    AFFINITY
 EndSysreg
 
+Sysreg SVCR    3       3       4       2       2
+Res0   63:2
+Field  1       ZA
+Field  0       SM
+EndSysreg
+
 Sysreg SMPRIMAP_EL2    3       4       1       2       5
 Field  63:60   P15
 Field  59:56   P14