Skip to content

Commit b5c0f10

Browse files
brooniectmarinas
authored andcommitted
arm64/sysreg: Generate definitions for CPACR_ELx
Convert the CPACR system register definitions to be automatically generated using the definitions in DDI0487H.a. The kernel does have some additional definitions for subfields of SMEN, FPEN and ZEN which are not identified as distinct subfields in the architecture so the definitions are not updated as part of this patch. No functional change. Signed-off-by: Mark Brown <[email protected]> Reviewed-by: Mark Rutland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 8c12e22 commit b5c0f10

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
#define SYS_ID_AA64MMFR2_EL1 sys_reg(3, 0, 0, 7, 2)
210210

211211
#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
212-
#define SYS_CPACR_EL1 sys_reg(3, 0, 1, 0, 2)
213212
#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)
214213
#define SYS_GCR_EL1 sys_reg(3, 0, 1, 0, 6)
215214

@@ -614,7 +613,6 @@
614613

615614
/* VHE encodings for architectural EL0/1 system registers */
616615
#define SYS_SCTLR_EL12 sys_reg(3, 5, 1, 0, 0)
617-
#define SYS_CPACR_EL12 sys_reg(3, 5, 1, 0, 2)
618616
#define SYS_TTBR0_EL12 sys_reg(3, 5, 2, 0, 0)
619617
#define SYS_TTBR1_EL12 sys_reg(3, 5, 2, 0, 1)
620618
#define SYS_TCR_EL12 sys_reg(3, 5, 2, 0, 2)

arch/arm64/tools/sysreg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,22 @@ Field 1 A
185185
Field 0 M
186186
EndSysreg
187187

188+
SysregFields CPACR_ELx
189+
Res0 63:29
190+
Field 28 TTA
191+
Res0 27:26
192+
Field 25:24 SMEN
193+
Res0 23:22
194+
Field 21:20 FPEN
195+
Res0 19:18
196+
Field 17:16 ZEN
197+
Res0 15:0
198+
EndSysregFields
199+
200+
Sysreg CPACR_EL1 3 0 1 0 2
201+
Fields CPACR_ELx
202+
EndSysreg
203+
188204
Sysreg SMPRI_EL1 3 0 1 2 4
189205
Res0 63:4
190206
Field 3:0 PRIORITY
@@ -283,6 +299,10 @@ Sysreg CONTEXTIDR_EL2 3 4 13 0 1
283299
Fields CONTEXTIDR_ELx
284300
EndSysreg
285301

302+
Sysreg CPACR_EL12 3 5 1 0 2
303+
Fields CPACR_ELx
304+
EndSysreg
305+
286306
Sysreg ZCR_EL12 3 5 1 2 0
287307
Fields ZCR_ELx
288308
EndSysreg

0 commit comments

Comments
 (0)