arm64: Add back cpu reset routines

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kernel / hyp-stub.S

diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 8727f44907725445efd25735b9638672a2599cb0..d3b5f75e652efce050f8c0c7d5cdef69e0351dfd 100644 (file)
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -71,8 +71,16 @@ el1_sync:
        msr     vbar_el2, x1
        b       9f
 
+2:     cmp     x0, #HVC_SOFT_RESTART
+       b.ne    3f
+       mov     x0, x2
+       mov     x2, x4
+       mov     x4, x1
+       mov     x1, x3
+       br      x4                              // no return
+
        /* Someone called kvm_call_hyp() against the hyp-stub... */
-2:     mov     x0, #ARM_EXCEPTION_HYP_GONE
+3:     mov     x0, #ARM_EXCEPTION_HYP_GONE
 
 9:     eret
 ENDPROC(el1_sync)