Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4a12e00 authored by Dave Martin's avatar Dave Martin Committed by Will Deacon
Browse files

ARM: virt: Avoid bx instruction for compatibility with <=ARMv4 



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.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
[will: fixed up remaining bx instruction]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 9931faca

arch/arm/kernel/hyp-stub.S

+3 −3
Original line number Diff line number Diff line
@@ -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