summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/hyp-stub.S
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 20:37:37 +0200
committerChristoffer Dall <cdall@linaro.org>2017-04-09 16:49:19 +0200
commit4993fdcf399f59ed56a16ecfedf8a61066198816 (patch)
tree7a8779155a6d2e6fdcbcb67c3558fbca34b926b1 /arch/arm64/kernel/hyp-stub.S
parentarm64: hyp-stub: Don't save lr in the EL1 code (diff)
downloadlinux-4993fdcf399f59ed56a16ecfedf8a61066198816.tar.xz
linux-4993fdcf399f59ed56a16ecfedf8a61066198816.zip
arm64: hyp-stub: Define a return value for failed stub calls
Define a standard return value to be returned when a hyp stub call fails, and make KVM use it for ARM_EXCEPTION_HYP_GONE (instead of using a KVM-specific value). Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm64/kernel/hyp-stub.S')
-rw-r--r--arch/arm64/kernel/hyp-stub.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 193dfb25ce2f..f53e8b84cd3a 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -74,7 +74,7 @@ el1_sync:
br x4 // no return
/* Someone called kvm_call_hyp() against the hyp-stub... */
-3: mov x0, #ARM_EXCEPTION_HYP_GONE
+3: ldr x0, =HVC_STUB_ERR
9: eret
ENDPROC(el1_sync)