Skip to content

Commit 0516fc4

Browse files
committed
arm64: sysreg: Fix and tidy up sysreg field definitions
JIRA: https://issues.redhat.com/browse/RHEL-101059 commit 2c2529e Author: Fuad Tabba <tabba@google.com> Date: Fri, 29 Aug 2025 10:51:41 +0100 Fix the value of ID_PFR1_EL1.Security NSACR_RFR to be 0b0010, as per DDI0601/2025-06, which wasn't correctly set when introduced in commit 1224308 ("arm64/sysreg: Convert ID_PFR1_EL1 to automatic generation"). While at it, remove redundant definitions of CPACR_EL12 and RCWSMASK_EL1 and fix some typos. Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> Acked-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Fuad Tabba <tabba@google.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Mark Salter <msalter@redhat.com>
1 parent 2f69766 commit 0516fc4

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

arch/arm64/tools/sysreg

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# Mapping <name_EL1>
3232
# EndSysreg
3333

34-
# Where multiple system regsiters are not VHE aliases but share a
34+
# Where multiple system registers are not VHE aliases but share a
3535
# common layout, a SysregFields block can be used to describe the
3636
# shared layout:
3737

@@ -54,7 +54,7 @@
5454
#
5555
# In general it is recommended that new enumeration items be named for the
5656
# feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration
57-
# item ACCDATA) though it may be more taseful to do something else.
57+
# item ACCDATA) though it may be more tasteful to do something else.
5858

5959
Sysreg OSDTRRX_EL1 2 0 0 0 2
6060
Res0 63:32
@@ -474,7 +474,7 @@ EndEnum
474474
Enum 7:4 Security
475475
0b0000 NI
476476
0b0001 EL3
477-
0b0001 NSACR_RFR
477+
0b0010 NSACR_RFR
478478
EndEnum
479479
UnsignedEnum 3:0 ProgMod
480480
0b0000 NI
@@ -2528,10 +2528,6 @@ Field 17:16 ZEN
25282528
Res0 15:0
25292529
EndSysreg
25302530

2531-
Sysreg CPACR_EL12 3 5 1 0 2
2532-
Mapping CPACR_EL1
2533-
EndSysreg
2534-
25352531
Sysreg CPACRALIAS_EL1 3 0 1 4 4
25362532
Mapping CPACR_EL1
25372533
EndSysreg
@@ -2576,10 +2572,6 @@ Sysreg PFAR_EL12 3 5 6 0 5
25762572
Mapping PFAR_EL1
25772573
EndSysreg
25782574

2579-
Sysreg RCWSMASK_EL1 3 0 13 0 3
2580-
Field 63:0 RCWSMASK
2581-
EndSysreg
2582-
25832575
Sysreg SCTLR2_EL1 3 0 1 0 3
25842576
Res0 63:13
25852577
Field 12 CPTM0

0 commit comments

Comments
 (0)