| Message ID | 20241207190740.2607673-4-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64/sysreg: Get rid of *_ELx as fields for EL12 accessors | expand |
On Sat, Dec 07, 2024 at 07:07:39PM +0000, Marc Zyngier wrote: > Perform a bulk convert of the remaining EL12 accessors to use the > Mapping qualifier, which meakes things a bit clearer. > > Signed-off-by: Marc Zyngier <maz@kernel.org> I haven't looked at the code in detail, but conceptually this makes sense to me, so: Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/tools/sysreg | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg > index 19d137d9c50ed..ad2f6265f7948 100644 > --- a/arch/arm64/tools/sysreg > +++ b/arch/arm64/tools/sysreg > @@ -2954,23 +2954,23 @@ Field 63:0 PhysicalOffset > EndSysreg > > Sysreg CPACR_EL12 3 5 1 0 2 > -Fields CPACR_ELx > +Mapping CPACR_EL1 > EndSysreg > > Sysreg ZCR_EL12 3 5 1 2 0 > -Fields ZCR_ELx > +Mapping ZCR_EL1 > EndSysreg > > Sysreg SMCR_EL12 3 5 1 2 6 > -Fields SMCR_ELx > +Mapping SMCR_EL1 > EndSysreg > > Sysreg GCSCR_EL12 3 5 2 5 0 > -Fields GCSCR_ELx > +Mapping GCSCR_EL1 > EndSysreg > > Sysreg GCSPR_EL12 3 5 2 5 1 > -Fields GCSPR_ELx > +Mapping GCSPR_EL1 > EndSysreg > > Sysreg FAR_EL12 3 5 6 0 0 > @@ -2982,7 +2982,7 @@ Fields MPAM1_ELx > EndSysreg > > Sysreg CONTEXTIDR_EL12 3 5 13 0 1 > -Fields CONTEXTIDR_ELx > +Mapping CONTEXTIDR_EL1 > EndSysreg > > SysregFields TTBRx_EL1 > @@ -3087,7 +3087,7 @@ Fields PIRx_ELx > EndSysreg > > Sysreg PIRE0_EL12 3 5 10 2 2 > -Fields PIRx_ELx > +Mapping PIRE0_EL1 > EndSysreg > > Sysreg PIRE0_EL2 3 4 10 2 2 > @@ -3099,7 +3099,7 @@ Fields PIRx_ELx > EndSysreg > > Sysreg PIR_EL12 3 5 10 2 3 > -Fields PIRx_ELx > +Mapping PIR_EL1 > EndSysreg > > Sysreg PIR_EL2 3 4 10 2 3 > @@ -3119,7 +3119,7 @@ Fields PIRx_ELx > EndSysreg > > Sysreg POR_EL12 3 5 10 2 4 > -Fields PIRx_ELx > +Mapping POR_EL1 > EndSysreg > > Sysreg S2POR_EL1 3 0 10 2 5 > -- > 2.39.2 >
On Sat, Dec 07, 2024 at 07:07:39PM +0000, Marc Zyngier wrote: > Perform a bulk convert of the remaining EL12 accessors to use the > Mapping qualifier, which meakes things a bit clearer. Reviewed-by: Mark Brown <broonie@kernel.org>
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 19d137d9c50ed..ad2f6265f7948 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -2954,23 +2954,23 @@ Field 63:0 PhysicalOffset EndSysreg Sysreg CPACR_EL12 3 5 1 0 2 -Fields CPACR_ELx +Mapping CPACR_EL1 EndSysreg Sysreg ZCR_EL12 3 5 1 2 0 -Fields ZCR_ELx +Mapping ZCR_EL1 EndSysreg Sysreg SMCR_EL12 3 5 1 2 6 -Fields SMCR_ELx +Mapping SMCR_EL1 EndSysreg Sysreg GCSCR_EL12 3 5 2 5 0 -Fields GCSCR_ELx +Mapping GCSCR_EL1 EndSysreg Sysreg GCSPR_EL12 3 5 2 5 1 -Fields GCSPR_ELx +Mapping GCSPR_EL1 EndSysreg Sysreg FAR_EL12 3 5 6 0 0 @@ -2982,7 +2982,7 @@ Fields MPAM1_ELx EndSysreg Sysreg CONTEXTIDR_EL12 3 5 13 0 1 -Fields CONTEXTIDR_ELx +Mapping CONTEXTIDR_EL1 EndSysreg SysregFields TTBRx_EL1 @@ -3087,7 +3087,7 @@ Fields PIRx_ELx EndSysreg Sysreg PIRE0_EL12 3 5 10 2 2 -Fields PIRx_ELx +Mapping PIRE0_EL1 EndSysreg Sysreg PIRE0_EL2 3 4 10 2 2 @@ -3099,7 +3099,7 @@ Fields PIRx_ELx EndSysreg Sysreg PIR_EL12 3 5 10 2 3 -Fields PIRx_ELx +Mapping PIR_EL1 EndSysreg Sysreg PIR_EL2 3 4 10 2 3 @@ -3119,7 +3119,7 @@ Fields PIRx_ELx EndSysreg Sysreg POR_EL12 3 5 10 2 4 -Fields PIRx_ELx +Mapping POR_EL1 EndSysreg Sysreg S2POR_EL1 3 0 10 2 5
Perform a bulk convert of the remaining EL12 accessors to use the Mapping qualifier, which meakes things a bit clearer. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/tools/sysreg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)