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

arm64: KVM: Move vector offsetting from hyp-init.S to kvm_get_hyp_vector 

We currently provide the hyp-init code with a kernel VA, and expect
it to turn it into a HYP va by itself. As we're about to provide
the hypervisor with mappings that are not necessarily in the memory
range, let's move the kern_hyp_va macro to kvm_get_hyp_vector.

No functionnal change.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2018-02-12 16:50:19 +00:00
parent 6bb934af1f
commit 3c5e81232e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/include/asm/kvm_mmu.h
View File

@ -374,6 +374,7 @@ static inline void *kvm_get_hyp_vector(void)
vect = lm_alias(vect); vect = lm_alias(vect);
} }
vect = kern_hyp_va(vect);
return vect; return vect;
} }
@ -387,7 +388,7 @@ static inline int kvm_map_vectors(void)
#else #else
static inline void *kvm_get_hyp_vector(void) static inline void *kvm_get_hyp_vector(void)
{ {
return kvm_ksym_ref(__kvm_hyp_vector); return kern_hyp_va(kvm_ksym_ref(__kvm_hyp_vector));
} }
static inline int kvm_map_vectors(void) static inline int kvm_map_vectors(void)

1
arch/arm64/kvm/hyp-init.S
View File

@ -117,7 +117,6 @@ CPU_BE( orr x4, x4, #SCTLR_ELx_EE)
/* Set the stack and new vectors */ /* Set the stack and new vectors */
kern_hyp_va x1 kern_hyp_va x1
mov sp, x1 mov sp, x1
kern_hyp_va x2
msr vbar_el2, x2 msr vbar_el2, x2
/* copy tpidr_el1 into tpidr_el2 for use by HYP */ /* copy tpidr_el1 into tpidr_el2 for use by HYP */