| From a4a12e008e292a81d312659529b71be2026ab355 Mon Sep 17 00:00:00 2001 |
| From: Dave Martin <dave.martin@linaro.org> |
| Date: Fri, 30 Nov 2012 11:56:05 +0000 |
| Subject: ARM: virt: Avoid bx instruction for compatibility with <=ARMv4 |
| |
| From: Dave Martin <dave.martin@linaro.org> |
| |
| commit a4a12e008e292a81d312659529b71be2026ab355 upstream. |
| |
| Non-T variants of ARMv4 do not support the bx instruction. |
| |
| However, __hyp_stub_install is always called from the same |
| instruction set used to build the bulk of the kernel, so bx should |
| not be necessary. |
| |
| This patch uses the traditional "mov pc" instead of bx. |
| |
| Signed-off-by: Dave Martin <dave.martin@linaro.org> |
| [will: fixed up remaining bx instruction] |
| Signed-off-by: Will Deacon <will.deacon@arm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/kernel/hyp-stub.S | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/kernel/hyp-stub.S |
| +++ b/arch/arm/kernel/hyp-stub.S |
| @@ -99,7 +99,7 @@ ENTRY(__hyp_stub_install_secondary) |
| * immediately. |
| */ |
| compare_cpu_mode_with_primary r4, r5, r6, r7 |
| - bxne lr |
| + movne pc, lr |
| |
| /* |
| * Once we have given up on one CPU, we do not try to install the |
| @@ -111,7 +111,7 @@ ENTRY(__hyp_stub_install_secondary) |
| */ |
| |
| cmp r4, #HYP_MODE |
| - bxne lr @ give up if the CPU is not in HYP mode |
| + movne pc, lr @ give up if the CPU is not in HYP mode |
| |
| /* |
| * Configure HSCTLR to set correct exception endianness/instruction set |
| @@ -200,7 +200,7 @@ ENDPROC(__hyp_get_vectors) |
| @ fall through |
| ENTRY(__hyp_set_vectors) |
| __HVC(0) |
| - bx lr |
| + mov pc, lr |
| ENDPROC(__hyp_set_vectors) |
| |
| #ifndef ZIMAGE |