diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 19:37:35 +0100 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 07:49:18 -0700 |
| commit | 6c9ae25dfcaea32512fc27308c64e78159c46aeb (patch) | |
| tree | d23f2e163b98dcb6468545cc7a6ab84c1002aafe /arch/arm64/kvm | |
| parent | 50d912cc3e5055c14e13a8e7de5c078b01a2e2b7 (diff) | |
| download | linux-stable-6c9ae25dfcaea32512fc27308c64e78159c46aeb.tar.gz linux-stable-6c9ae25dfcaea32512fc27308c64e78159c46aeb.tar.bz2 linux-stable-6c9ae25dfcaea32512fc27308c64e78159c46aeb.zip | |
arm64: KVM: Move lr save/restore to do_el2_call
At the moment, we only save/restore lr if on VHE, as we rely only
the EL1 code to have preserved it in the non-VHE case.
As we're about to get rid of the latter, let's move the save/restore
code to the do_el2_call macro, unifying both code paths.
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>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 3 | ||||
| -rw-r--r-- | arch/arm64/kvm/hyp/hyp-entry.S | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 2726635dceba..f6f20b58d65a 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -38,13 +38,10 @@ * A function pointer with a value less than 0xfff has a special meaning, * and is used to implement __hyp_get_vectors in the same way as in * arch/arm64/kernel/hyp_stub.S. - * HVC behaves as a 'bl' call and will clobber lr. */ ENTRY(__kvm_call_hyp) alternative_if_not ARM64_HAS_VIRT_HOST_EXTN - str lr, [sp, #-16]! hvc #0 - ldr lr, [sp], #16 ret alternative_else_nop_endif b __vhe_hyp_call diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 5e9052f087f2..d8ef788646c6 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -32,17 +32,17 @@ * Shuffle the parameters before calling the function * pointed to in x0. Assumes parameters in x[1,2,3]. */ + str lr, [sp, #-16]! mov lr, x0 mov x0, x1 mov x1, x2 mov x2, x3 blr lr + ldr lr, [sp], #16 .endm ENTRY(__vhe_hyp_call) - str lr, [sp, #-16]! do_el2_call - ldr lr, [sp], #16 /* * We used to rely on having an exception return to get * an implicit isb. In the E2H case, we don't have it anymore. |