Skip to content

Commit dffdead

Browse files
brooniectmarinas
authored andcommitted
arm64/sysreg: Generate definitions for FAR_ELx
Convert FAR_ELx to automatic register generation as per DDI0487H.a. In the architecture these registers have a single field "named" as "Faulting Virtual Address for synchronous exceptions taken to ELx" occupying the entire register, in order to fit in with the requirement to describe the contents of the register I have created a single field named ADDR. 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-7-broonie@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 01baa57 commit dffdead

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
#define SYS_TFSR_EL1 sys_reg(3, 0, 5, 6, 0)
250250
#define SYS_TFSRE0_EL1 sys_reg(3, 0, 5, 6, 1)
251251

252-
#define SYS_FAR_EL1 sys_reg(3, 0, 6, 0, 0)
253252
#define SYS_PAR_EL1 sys_reg(3, 0, 7, 4, 0)
254253

255254
#define SYS_PAR_EL1_F BIT(0)
@@ -564,7 +563,6 @@
564563
#define SYS_VSESR_EL2 sys_reg(3, 4, 5, 2, 3)
565564
#define SYS_FPEXC32_EL2 sys_reg(3, 4, 5, 3, 0)
566565
#define SYS_TFSR_EL2 sys_reg(3, 4, 5, 6, 0)
567-
#define SYS_FAR_EL2 sys_reg(3, 4, 6, 0, 0)
568566

569567
#define SYS_VDISR_EL2 sys_reg(3, 4, 12, 1, 1)
570568
#define __SYS__AP0Rx_EL2(x) sys_reg(3, 4, 12, 8, x)
@@ -619,7 +617,6 @@
619617
#define SYS_AFSR1_EL12 sys_reg(3, 5, 5, 1, 1)
620618
#define SYS_ESR_EL12 sys_reg(3, 5, 5, 2, 0)
621619
#define SYS_TFSR_EL12 sys_reg(3, 5, 5, 6, 0)
622-
#define SYS_FAR_EL12 sys_reg(3, 5, 6, 0, 0)
623620
#define SYS_MAIR_EL12 sys_reg(3, 5, 10, 2, 0)
624621
#define SYS_AMAIR_EL12 sys_reg(3, 5, 10, 3, 0)
625622
#define SYS_VBAR_EL12 sys_reg(3, 5, 12, 0, 0)

arch/arm64/tools/sysreg

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ Sysreg SMCR_EL1 3 0 1 2 6
228228
Fields SMCR_ELx
229229
EndSysreg
230230

231+
Sysreg FAR_EL1 3 0 6 0 0
232+
Field 63:0 ADDR
233+
EndSysreg
234+
231235
SysregFields CONTEXTIDR_ELx
232236
Res0 63:32
233237
Field 31:0 PROCID
@@ -322,6 +326,10 @@ Field 3:2 D1
322326
Field 1:0 D0
323327
EndSysreg
324328

329+
Sysreg FAR_EL2 3 4 6 0 0
330+
Field 63:0 ADDR
331+
EndSysreg
332+
325333
Sysreg CONTEXTIDR_EL2 3 4 13 0 1
326334
Fields CONTEXTIDR_ELx
327335
EndSysreg
@@ -338,6 +346,10 @@ Sysreg SMCR_EL12 3 5 1 2 6
338346
Fields SMCR_ELx
339347
EndSysreg
340348

349+
Sysreg FAR_EL12 3 5 6 0 0
350+
Field 63:0 ADDR
351+
EndSysreg
352+
341353
Sysreg CONTEXTIDR_EL12 3 5 13 0 1
342354
Fields CONTEXTIDR_ELx
343355
EndSysreg

0 commit comments

Comments
 (0)