diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2016-06-30 18:40:44 +0100 |
|---|---|---|
| committer |   Christoffer Dall <christoffer.dall@linaro.org> | 2016-07-03 23:41:27 +0200 |
| commit | 3421e9d88d7ae70fbc8c903e44a5acace8ae2d29 (patch) | |
| tree | 5c01693941098bc3d6a20d5ee4b0c88c2d895e2e /arch/arm64/kvm/hyp/entry.S | |
| parent | arm/arm64: KVM: Always have merged page tables (diff) | |
| download | linux-dev-3421e9d88d7ae70fbc8c903e44a5acace8ae2d29.tar.xz linux-dev-3421e9d88d7ae70fbc8c903e44a5acace8ae2d29.zip | |
arm64: KVM: Simplify HYP init/teardown
Now that we only have the "merged page tables" case to deal with,
there is a bunch of things we can simplify in the HYP code (both
at init and teardown time).
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/entry.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/entry.S | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 70254a65bd5b..ce9e5e5f28cf 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -164,22 +164,3 @@ alternative_endif eret ENDPROC(__fpsimd_guest_restore) - -/* - * When using the extended idmap, we don't have a trampoline page we can use - * while we switch pages tables during __kvm_hyp_reset. Accessing the idmap - * directly would be ideal, but if we're using the extended idmap then the - * idmap is located above HYP_PAGE_OFFSET, and the address will be masked by - * kvm_call_hyp using kern_hyp_va. - * - * x0: HYP boot pgd - * x1: HYP phys_idmap_start - */ -ENTRY(__extended_idmap_trampoline) - mov x4, x1 - adr_l x3, __kvm_hyp_reset - - /* insert __kvm_hyp_reset()s offset into phys_idmap_start */ - bfi x4, x3, #0, #PAGE_SHIFT - br x4 -ENDPROC(__extended_idmap_trampoline) |