diff options
| author | David Brazdil <dbrazdil@google.com> | 2020-06-25 15:14:17 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-05 19:38:38 +0200 |
| commit | 9aebdea494b5d2d5fe0ba54d71e9d6c5acfe76b4 (patch) | |
| tree | 523b5b8b519681b067f767b820193a9eafdb989a /arch/arm64/include/asm/kvm_hyp.h | |
| parent | KVM: arm64: Split hyp/sysreg-sr.c to VHE/nVHE (diff) | |
| download | linux-9aebdea494b5d2d5fe0ba54d71e9d6c5acfe76b4.tar.xz linux-9aebdea494b5d2d5fe0ba54d71e9d6c5acfe76b4.zip | |
KVM: arm64: Duplicate hyp/timer-sr.c for VHE/nVHE
timer-sr.c contains a HVC handler for setting CNTVOFF_EL2 and two helper
functions for controlling access to physical counter. The former is used by
both VHE/nVHE and is duplicated, the latter are used only by nVHE and moved
to nvhe/timer-sr.c.
Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-13-dbrazdil@google.com
Diffstat (limited to 'arch/arm64/include/asm/kvm_hyp.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_hyp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index 997c5bda1ac7..19f8b40fe6cf 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -63,8 +63,10 @@ void __vgic_v3_save_aprs(struct vgic_v3_cpu_if *cpu_if); void __vgic_v3_restore_aprs(struct vgic_v3_cpu_if *cpu_if); int __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu); +#ifdef __KVM_NVHE_HYPERVISOR__ void __timer_enable_traps(struct kvm_vcpu *vcpu); void __timer_disable_traps(struct kvm_vcpu *vcpu); +#endif #ifdef __KVM_NVHE_HYPERVISOR__ void __sysreg_save_state_nvhe(struct kvm_cpu_context *ctxt); |