| Message ID | 20231127172613.1490283-4-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: Drop support for VPIPT i-cache policy | expand |
On 11/27/23 22:56, Marc Zyngier wrote: > We now have *two* values for CTR_EL0.L1Ip that are reserved. > Which makes things a bit awkward. In order to lift the ambiguity, > rename RESERVED (0b01) to RESERVED_AIVIVT, and VPIPT (0b00) to > RESERVED_VPIPT. > > This makes it clear which of these meant what, and I'm sure > archeologists will find it useful... > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > arch/arm64/tools/sysreg | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg > index 96cbeeab4eec..5a217e0fce45 100644 > --- a/arch/arm64/tools/sysreg > +++ b/arch/arm64/tools/sysreg > @@ -2004,9 +2004,10 @@ Field 27:24 CWG > Field 23:20 ERG > Field 19:16 DminLine > Enum 15:14 L1Ip > - 0b00 VPIPT > + # This was named as VPIPT in the ARM but now documented as reserved > + 0b00 RESERVED_VPIPT > # This is named as AIVIVT in the ARM but documented as reserved > - 0b01 RESERVED > + 0b01 RESERVED_AVIVT s/RESERVED_AVIVT/RESERVED_AIVIVT - matches the spec. Commit message has got this right. > 0b10 VIPT > 0b11 PIPT > EndEnum
On Wed, 29 Nov 2023 07:13:57 +0000, Anshuman Khandual <anshuman.khandual@arm.com> wrote: > > > > On 11/27/23 22:56, Marc Zyngier wrote: > > We now have *two* values for CTR_EL0.L1Ip that are reserved. > > Which makes things a bit awkward. In order to lift the ambiguity, > > rename RESERVED (0b01) to RESERVED_AIVIVT, and VPIPT (0b00) to > > RESERVED_VPIPT. > > > > This makes it clear which of these meant what, and I'm sure > > archeologists will find it useful... > > > > Signed-off-by: Marc Zyngier <maz@kernel.org> > > --- > > arch/arm64/tools/sysreg | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg > > index 96cbeeab4eec..5a217e0fce45 100644 > > --- a/arch/arm64/tools/sysreg > > +++ b/arch/arm64/tools/sysreg > > @@ -2004,9 +2004,10 @@ Field 27:24 CWG > > Field 23:20 ERG > > Field 19:16 DminLine > > Enum 15:14 L1Ip > > - 0b00 VPIPT > > + # This was named as VPIPT in the ARM but now documented as reserved > > + 0b00 RESERVED_VPIPT > > # This is named as AIVIVT in the ARM but documented as reserved > > - 0b01 RESERVED > > + 0b01 RESERVED_AVIVT > > s/RESERVED_AVIVT/RESERVED_AIVIVT - matches the spec. Commit message > has got this right. Huh, how embarrassing. Thanks for pointing this out, I'll fix it in the next round. M.
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 96cbeeab4eec..5a217e0fce45 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -2004,9 +2004,10 @@ Field 27:24 CWG Field 23:20 ERG Field 19:16 DminLine Enum 15:14 L1Ip - 0b00 VPIPT + # This was named as VPIPT in the ARM but now documented as reserved + 0b00 RESERVED_VPIPT # This is named as AIVIVT in the ARM but documented as reserved - 0b01 RESERVED + 0b01 RESERVED_AVIVT 0b10 VIPT 0b11 PIPT EndEnum
We now have *two* values for CTR_EL0.L1Ip that are reserved. Which makes things a bit awkward. In order to lift the ambiguity, rename RESERVED (0b01) to RESERVED_AIVIVT, and VPIPT (0b00) to RESERVED_VPIPT. This makes it clear which of these meant what, and I'm sure archeologists will find it useful... Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/tools/sysreg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)