diff options
| author | Andrew Scull <ascull@google.com> | 2020-09-15 11:46:38 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-15 18:39:03 +0100 |
| commit | 5dc33bd199ca3b9f53c28144fa9a20b43c908972 (patch) | |
| tree | 6e4f42cd8b37faaaec729b4ec35f42d94440e41f /arch/arm64 | |
| parent | a2e102e20fd69ce26ea9fe7bd0df26d25dafff59 (diff) | |
| download | linux-5dc33bd199ca3b9f53c28144fa9a20b43c908972.tar.gz linux-5dc33bd199ca3b9f53c28144fa9a20b43c908972.tar.bz2 linux-5dc33bd199ca3b9f53c28144fa9a20b43c908972.zip | |
KVM: arm64: nVHE: Pass pointers consistently to hyp-init
Rather than some being kernel pointer and others being hyp pointers,
standardize on all pointers being hyp pointers.
Signed-off-by: Andrew Scull <ascull@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200915104643.2543892-15-ascull@google.com
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 1 | ||||
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/hyp-init.S | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index ae4b34f91e94..6b7180072c8d 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1278,6 +1278,7 @@ static void cpu_init_hyp_mode(void) pgd_ptr = kvm_mmu_get_httbr(); hyp_stack_ptr = __this_cpu_read(kvm_arm_hyp_stack_page) + PAGE_SIZE; + hyp_stack_ptr = kern_hyp_va(hyp_stack_ptr); vector_ptr = (unsigned long)kern_hyp_va(kvm_ksym_ref(__kvm_hyp_host_vector)); /* diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index d9434e90c06d..abe885e26fe2 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -114,7 +114,6 @@ alternative_else_nop_endif isb /* Set the stack and new vectors */ - kern_hyp_va x1 mov sp, x1 msr vbar_el2, x2 |