Commit 9aebdea4 authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

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: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-13-dbrazdil@google.com
parent 13aeb9b4

arch/arm64/include/asm/kvm_hyp.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm64/kernel/image-vars.h

+0 −5
Original line number Diff line number Diff line
@@ -76,11 +76,6 @@ KVM_NVHE_ALIAS(abort_guest_exit_start); 
KVM_NVHE_ALIAS(__fpsimd_restore_state);

KVM_NVHE_ALIAS(__fpsimd_save_state);



/* Symbols defined in timer-sr.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__kvm_timer_set_cntvoff);

KVM_NVHE_ALIAS(__timer_disable_traps);

KVM_NVHE_ALIAS(__timer_enable_traps);



/* Symbols defined in vgic-v2-cpuif-proxy.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__vgic_v2_perform_cpuif_access);

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ subdir-ccflags-y := -I$(incdir) \ 
obj-$(CONFIG_KVM) += hyp.o vhe/ nvhe/

obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o



hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \

hyp-y := vgic-v3-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \

	 fpsimd.o



# KVM code is run at a different exception code with a different map, so

arch/arm64/kvm/hyp/nvhe/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
asflags-y := -D__KVM_NVHE_HYPERVISOR__

ccflags-y := -D__KVM_NVHE_HYPERVISOR__



obj-y := sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o ../hyp-entry.o

obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o \

	 ../hyp-entry.o



obj-y := $(patsubst %.o,%.hyp.o,$(obj-y))

extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y))

arch/arm64/kvm/hyp/timer-sr.c→arch/arm64/kvm/hyp/nvhe/timer-sr.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include <asm/kvm_hyp.h>



void __hyp_text __kvm_timer_set_cntvoff(u64 cntvoff)

void __kvm_timer_set_cntvoff(u64 cntvoff)

{

	write_sysreg(cntvoff, cntvoff_el2);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE