diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:28:14 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:28:14 +0000 |
| commit | 30431774fe6e96f9418911f36b99914f54089d75 (patch) | |
| tree | 66dbdc996775f1a6ff38858d2015211e94fd68b3 /arch/arm64/tools | |
| parent | dd9168ab08ebbf5643434c652a5f22ffa96dbdf3 (diff) | |
| parent | f35c32ca6839f5777862dbe2138d02bf50b3dfa7 (diff) | |
| download | linux-30431774fe6e96f9418911f36b99914f54089d75.tar.gz linux-30431774fe6e96f9418911f36b99914f54089d75.tar.bz2 linux-30431774fe6e96f9418911f36b99914f54089d75.zip | |
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/sysreg | 5 |
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 |