arm64/sysreg: Convert OSLAR_EL1 to automatic generation

Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No
functional change.

Reviewed-by: Shaoqin Huang <shahuang@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20230419-arm64-syreg-gen-v2-4-4c6add1f6257@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 979975c8be2c2d3bf4eedb510b9f6e6049ae8c97..1901b676d7c6e630a4326a3f8b146cd81dee5947 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -143,9 +143,6 @@
 #define SYS_DBGWCRn_EL1(n)             sys_reg(2, 0, 0, n, 7)
 #define SYS_MDRAR_EL1                  sys_reg(2, 0, 1, 0, 0)
 
-#define SYS_OSLAR_EL1                  sys_reg(2, 0, 1, 0, 4)
-#define OSLAR_EL1_OSLK                 BIT(0)
-
 #define SYS_OSLSR_EL1                  sys_reg(2, 0, 1, 1, 4)
 #define OSLSR_EL1_OSLM_MASK            (BIT(3) | BIT(0))
 #define OSLSR_EL1_OSLM_NI              0

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 601cc8024734157ae03c1c20ada8c56c443bdab1..b0aefdf9ed34d24665afe2e9781bd7439947ac90 100644 (file)
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -83,6 +83,11 @@ Res0 5:1
 Field  0       SS
 EndSysreg
 
+Sysreg OSLAR_EL1       2       0       1       0       4
+Res0   63:1
+Field  0       OSLK
+EndSysreg
+
 Sysreg ID_PFR0_EL1     3       0       0       1       0
 Res0   63:32
 UnsignedEnum   31:28   RAS