[PATCH v3 1/3] arm64: sysreg: Fix and tidy up sysreg field definitions

[Mark Rutland]

On Fri, Aug 29, 2025 at 10:51:41AM +0100, Fuad Tabba wrote:
> 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
> 1224308075f1 ("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 at arm.com>
> Acked-by: Marc Zyngier <maz at kernel.org>
> Signed-off-by: Fuad Tabba <tabba at google.com>
> ---
> Note that NSACR_RFR isn't used in the kernel as far as I could tell, so
> I didn't add a 'Fixes' tag.

Since this is all cleanup, I think that's fine, but were that necessary,
it would be nicer to have the NSACR_RFR fix separate from the other
cleanups.

FWIW, as this stands:

Acked-by: Mark Rutland <mark.rutland at arm.com>

Mark.

> ---
>  arch/arm64/tools/sysreg | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
> index 696ab1f32a67..f1a012ee0db6 100644
> --- a/arch/arm64/tools/sysreg
> +++ b/arch/arm64/tools/sysreg
> @@ -31,7 +31,7 @@
>  # Mapping	<name_EL1>
>  # EndSysreg
>  
> -# Where multiple system regsiters are not VHE aliases but share a
> +# Where multiple system registers are not VHE aliases but share a
>  # common layout, a SysregFields block can be used to describe the
>  # shared layout:
>  
> @@ -54,7 +54,7 @@
>  #
>  # In general it is recommended that new enumeration items be named for the
>  # feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration
> -# item ACCDATA) though it may be more taseful to do something else.
> +# item ACCDATA) though it may be more tasteful to do something else.
>  
>  Sysreg	OSDTRRX_EL1	2	0	0	0	2
>  Res0	63:32
> @@ -474,7 +474,7 @@ EndEnum
>  Enum	7:4	Security
>  	0b0000	NI
>  	0b0001	EL3
> -	0b0001	NSACR_RFR
> +	0b0010	NSACR_RFR
>  EndEnum
>  UnsignedEnum	3:0	ProgMod
>  	0b0000	NI
> @@ -2528,10 +2528,6 @@ Field	17:16	ZEN
>  Res0	15:0
>  EndSysreg
>  
> -Sysreg	CPACR_EL12      3	5	1	0	2
> -Mapping	CPACR_EL1
> -EndSysreg
> -
>  Sysreg	CPACRALIAS_EL1  3	0	1	4	4
>  Mapping	CPACR_EL1
>  EndSysreg
> @@ -2576,10 +2572,6 @@ Sysreg	PFAR_EL12	3	5	6	0	5
>  Mapping	PFAR_EL1
>  EndSysreg
>  
> -Sysreg	RCWSMASK_EL1	3	0	13	0	3
> -Field	63:0	RCWSMASK
> -EndSysreg
> -
>  Sysreg	SCTLR2_EL1      3	0	1	0	3
>  Res0    63:13
>  Field   12      CPTM0
> -- 
> 2.51.0.338.gd7d06c2dae-goog
> 
>