arm64: Rename reserved values for CTR_EL0.L1Ip

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...

Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20231204143606.1806432-4-maz@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 96cbeeab4eec33e5dddab39670a84d1798c4dd2e..c5af75b23187cacfdd2f24a5376d63307fa49d12 100644 (file)
--- 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_AIVIVT
        0b10    VIPT
        0b11    PIPT
 EndEnum