hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Keerthy <j-keerthy@ti.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
This commit is contained in:
Marc Zyngier 2017-04-03 19:37:56 +01:00 committed by Christoffer Dall
parent 6bebcecb6c
commit a92ce8f6ab
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/kvm_asm.h
View File

@ -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);

2
arch/arm/include/asm/kvm_host.h
View File

@ -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)

2
arch/arm/kvm/init.S
View File

@ -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