From: Marc Zyngier <marc.zyngier@arm.com>
Date: Mon, 3 Apr 2017 18:37:41 +0000 (+0100)
Subject: arm64: KVM: Implement HVC_GET_VECTORS in the init code
X-Git-Tag: v4.12-rc1~68^2~6^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82529d9bfd6b7b0e8177be94ff768161d5064264;p=thirdparty%2Fkernel%2Flinux.git

arm64: 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.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
---

diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S
index 5e39ad53bcae2..fded932ede1b2 100644
--- a/arch/arm64/kvm/hyp-init.S
+++ b/arch/arm64/kvm/hyp-init.S
@@ -124,7 +124,12 @@ __do_hyp_init:
 ENDPROC(__kvm_hyp_init)
 
 ENTRY(__kvm_handle_stub_hvc)
-	cmp	x0, #HVC_RESET_VECTORS
+	cmp	x0, #HVC_GET_VECTORS
+	b.ne	1f
+	mrs	x0, vbar_el2
+	b	exit
+
+1:	cmp	x0, #HVC_RESET_VECTORS
 	b.ne	1f
 	/*
 	 * Reset kvm back to the hyp stub.