Commit 0fb26593 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm/arm64: KVM: Use __hyp_reset_vectors() directly 



__cpu_reset_hyp_mode doesn't need to be passed any argument now,
as the hyp-stub implementations are self-contained, and is now
reduced to just calling __hyp_reset_vectors(). Let's drop the
wrapper and use the stub hypercall directly.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 386627d8

arch/arm/include/asm/kvm_host.h

+0 −6
Original line number Diff line number Diff line
@@ -270,12 +270,6 @@ static inline void __cpu_init_stage2(void) 
	kvm_call_hyp(__init_stage2_translation);

}



static inline void __cpu_reset_hyp_mode(unsigned long vector_ptr,

					phys_addr_t phys_idmap_start)

{

	__hyp_reset_vectors();

}



static inline int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)

{

	return 0;

arch/arm/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -1130,8 +1130,7 @@ static void cpu_hyp_reinit(void) 
static void cpu_hyp_reset(void)

{

	if (!is_kernel_in_hyp_mode())

		__cpu_reset_hyp_mode(hyp_default_vectors,

				     kvm_get_idmap_start());

		__hyp_reset_vectors();

}



static void _kvm_arch_hardware_enable(void *discard)

arch/arm64/include/asm/kvm_host.h

+0 −6
Original line number Diff line number Diff line
@@ -362,12 +362,6 @@ static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr, 
	__kvm_call_hyp((void *)pgd_ptr, hyp_stack_ptr, vector_ptr);

}



static inline void __cpu_reset_hyp_mode(unsigned long vector_ptr,

					phys_addr_t phys_idmap_start)

{

	__hyp_reset_vectors();

}



static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE