diff options
| author | Marc Zyngier | 2015-01-29 16:47:55 +0100 |
|---|---|---|
| committer | Marc Zyngier | 2016-02-29 19:34:17 +0100 |
| commit | 68908bf789b7fd376538a4bad8367d5dcb9ec983 (patch) | |
| tree | 5c8593b0ba2a42cbeacf314572402fdc71b3aab8 /arch/arm64/include/asm/kvm_arm.h | |
| parent | arm64: KVM: VHE: Make __fpsimd_enabled VHE aware (diff) | |
| download | kernel-qcow2-linux-68908bf789b7fd376538a4bad8367d5dcb9ec983.tar.gz kernel-qcow2-linux-68908bf789b7fd376538a4bad8367d5dcb9ec983.tar.xz kernel-qcow2-linux-68908bf789b7fd376538a4bad8367d5dcb9ec983.zip | |
arm64: KVM: VHE: Implement VHE activate/deactivate_traps
Running the kernel in HYP mode requires the HCR_E2H bit to be set
at all times, and the HCR_TGE bit to be set when running as a host
(and cleared when running as a guest). At the same time, the vector
must be set to the current role of the kernel (either host or
hypervisor), and a couple of system registers differ between VHE
and non-VHE.
We implement these by using another set of alternate functions
that get dynamically patched.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/kvm_arm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index afa2f4a96210..b56a0a81e4cb 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -23,6 +23,7 @@ #include <asm/types.h> /* Hyp Configuration Register (HCR) bits */ +#define HCR_E2H (UL(1) << 34) #define HCR_ID (UL(1) << 33) #define HCR_CD (UL(1) << 32) #define HCR_RW_SHIFT 31 @@ -81,7 +82,7 @@ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW) #define HCR_VIRT_EXCP_MASK (HCR_VA | HCR_VI | HCR_VF) #define HCR_INT_OVERRIDE (HCR_FMO | HCR_IMO) - +#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) /* Hyp System Control Register (SCTLR_EL2) bits */ #define SCTLR_EL2_EE (1 << 25) |