diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 19:37:51 +0100 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 07:49:27 -0700 |
| commit | 4c70cf07cecab1dd5446249dc8d4795bec693c78 (patch) | |
| tree | a8b2399f86866ac905bc0a7d86048e4b79442bbf /arch/arm | |
| parent | cf763e4ede9deca45c83d7a59c8e798c4d079da2 (diff) | |
ARM: hyp-stub: Define a return value for failed stub calls
Define a standard return value to be returned when a hyp stub
call fails.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/virt.h | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h index 4ea16fcaf2ed..c16f70d6953f 100644 --- a/arch/arm/include/asm/virt.h +++ b/arch/arm/include/asm/virt.h @@ -104,4 +104,6 @@ extern char __hyp_text_end[]; #endif /* __ASSEMBLY__ */ +#define HVC_STUB_ERR 0xbadca11 + #endif /* ! VIRT_H */ diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 15eaa14322a7..b20ca8815911 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -216,7 +216,7 @@ __hyp_stub_do_trap: bne 1f bx r1 -1: mov r0, #-1 +1: ldr r0, =HVC_STUB_ERR __hyp_stub_exit: __ERET |