diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-30 13:06:42 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-30 13:06:42 -0400 |
commit | 41793e7f274e48c9c4a727e522eb22c875b77a0b (patch) | |
tree | 3754de4a66f19db3f6b9c1486b409fc7b58ee9aa /arch/arm64/include | |
parent | Linux 5.12-rc5 (diff) | |
parent | KVM: arm64: Fix CPU interface MMIO compatibility detection (diff) | |
download | linux-dev-41793e7f274e48c9c4a727e522eb22c875b77a0b.tar.xz linux-dev-41793e7f274e48c9c4a727e522eb22c875b77a0b.zip |
Merge tag 'kvmarm-fixes-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.12, take #3
- Fix GICv3 MMIO compatibility probing
- Prevent guests from using the ARMv8.4 self-hosted tracing extension
Diffstat (limited to 'arch/arm64/include')
-rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 4e90c2debf70..94d4025acc0b 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -278,6 +278,7 @@ #define CPTR_EL2_DEFAULT CPTR_EL2_RES1 /* Hyp Debug Configuration Register bits */ +#define MDCR_EL2_TTRF (1 << 19) #define MDCR_EL2_TPMS (1 << 14) #define MDCR_EL2_E2PB_MASK (UL(0x3)) #define MDCR_EL2_E2PB_SHIFT (UL(12)) |