ARM: KVM: Implement HVC_GET_VECTORS in the init code

Now that we have an infrastructure to handle hypercalls in the KVM
init code, let's implement HVC_GET_VECTORS there.

Tested-by: Keerthy <[email protected]>
Acked-by: Russell King <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Signed-off-by: Christoffer Dall <[email protected]>

diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index 86a7008e75a3521c72cffb84d91abb2468840383..d6b2f496fa136139ad714ab2820131ae9c528fad 100644 (file)
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -122,7 +122,12 @@ __do_hyp_init:
        eret
 
 ENTRY(__kvm_handle_stub_hvc)
-       cmp     r0, #HVC_RESET_VECTORS
+       cmp     r0, #HVC_GET_VECTORS
+       bne     1f
+       mrc     p15, 4, r0, c12, c0, 0  @ get HVBAR
+       b       exit
+
+1:     cmp     r0, #HVC_RESET_VECTORS
        bne     1f
 ENTRY(__kvm_hyp_reset)
        /* We're now in idmap, disable MMU */