arm64: KVM: Drop VHE-specific HYP call stub

We now call VHE code directly, without going through any central
dispatching function. Let's drop that code.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@arm.com>

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index 952f6cb9cf72051ec1415ad5d63954985544ba53..2845aa680841ea9623e517ebb1050524544a1fc6 100644 (file)
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -40,9 +40,6 @@
  * arch/arm64/kernel/hyp_stub.S.
  */
 ENTRY(__kvm_call_hyp)
-alternative_if_not ARM64_HAS_VIRT_HOST_EXTN
        hvc     #0
        ret
-alternative_else_nop_endif
-       b       __vhe_hyp_call
 ENDPROC(__kvm_call_hyp)

diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S
index 73c1b483ec3963817aca5a8c650766eb6d3d9508..2b1e686772bfd6786378ac4e4ee5afa3ce415fa8 100644 (file)
--- a/arch/arm64/kvm/hyp/hyp-entry.S
+++ b/arch/arm64/kvm/hyp/hyp-entry.S
@@ -43,18 +43,6 @@
        ldr     lr, [sp], #16
 .endm
 
-ENTRY(__vhe_hyp_call)
-       do_el2_call
-       /*
-        * We used to rely on having an exception return to get
-        * an implicit isb. In the E2H case, we don't have it anymore.
-        * rather than changing all the leaf functions, just do it here
-        * before returning to the rest of the kernel.
-        */
-       isb
-       ret
-ENDPROC(__vhe_hyp_call)
-
 el1_sync:                              // Guest trapped into EL2
 
        mrs     x0, esr_el2