summaryrefslogtreecommitdiff
path: root/arch/arm64/tools
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2024-01-04 15:28:14 +0300
committerWill Deacon <will@kernel.org>2024-01-04 15:28:14 +0300
commit30431774fe6e96f9418911f36b99914f54089d75 (patch)
tree66dbdc996775f1a6ff38858d2015211e94fd68b3 /arch/arm64/tools
parentdd9168ab08ebbf5643434c652a5f22ffa96dbdf3 (diff)
parentf35c32ca6839f5777862dbe2138d02bf50b3dfa7 (diff)
downloadlinux-30431774fe6e96f9418911f36b99914f54089d75.tar.xz
Merge branch 'for-next/rip-vpipt' into for-next/core
* for-next/rip-vpipt: arm64: Rename reserved values for CTR_EL0.L1Ip arm64: Kill detection of VPIPT i-cache policy KVM: arm64: Remove VPIPT I-cache handling
Diffstat (limited to 'arch/arm64/tools')
-rw-r--r--arch/arm64/tools/sysreg5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 96cbeeab4eec..c5af75b23187 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_AIVIVT
0b10 VIPT
0b11 PIPT
EndEnum