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

ARM: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors 



We are now able to use the hyp stub to reset HYP mode. Time to
kiss __kvm_hyp_reset goodbye, and use __hyp_reset_vectors.

Tested-by: default avatarKeerthy <j-keerthy@ti.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
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 6bebcecb

arch/arm/include/asm/kvm_asm.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,6 @@ extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); 




extern void __init_stage2_translation(void);

extern void __init_stage2_translation(void);





extern void __kvm_hyp_reset(unsigned long);



extern u64 __vgic_v3_get_ich_vtr_el2(void);

extern u64 __vgic_v3_get_ich_vtr_el2(void);

extern u64 __vgic_v3_read_vmcr(void);

extern u64 __vgic_v3_read_vmcr(void);

extern void __vgic_v3_write_vmcr(u32 vmcr);

extern void __vgic_v3_write_vmcr(u32 vmcr);

arch/arm/include/asm/kvm_host.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ static inline void __cpu_init_stage2(void) 
static inline void __cpu_reset_hyp_mode(unsigned long vector_ptr,

static inline void __cpu_reset_hyp_mode(unsigned long vector_ptr,

					phys_addr_t phys_idmap_start)

					phys_addr_t phys_idmap_start)

{

{

	kvm_call_hyp((void *)virt_to_idmap(__kvm_hyp_reset), vector_ptr);

	__hyp_reset_vectors();

}

}





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

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

arch/arm/kvm/init.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ ENTRY(__kvm_handle_stub_hvc) 




1:	cmp	r0, #HVC_RESET_VECTORS

1:	cmp	r0, #HVC_RESET_VECTORS

	bne	1f

	bne	1f

ENTRY(__kvm_hyp_reset)

	/* We're now in idmap, disable MMU */

	/* We're now in idmap, disable MMU */

	mrc	p15, 4, r1, c1, c0, 0	@ HSCTLR

	mrc	p15, 4, r1, c1, c0, 0	@ HSCTLR

	ldr	r0, =(HSCTLR_M | HSCTLR_A | HSCTLR_C | HSCTLR_I)

	ldr	r0, =(HSCTLR_M | HSCTLR_A | HSCTLR_C | HSCTLR_I)
@@ -151,7 +150,6 @@ ENTRY(__kvm_hyp_reset) 
exit:

exit:

	eret

	eret

ENDPROC(__kvm_handle_stub_hvc)

ENDPROC(__kvm_handle_stub_hvc)

ENDPROC(__kvm_hyp_reset)





	.ltorg

	.ltorg

CRA Git | Maintained and supported by SUSTech CRA and CCSE