Skip to contentSkip to conversation

Patch "ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 448c077eeb02240c430db2a2c3bf5285a4c65d66 Mon Sep 17 00:00:00 2001

From: Matthijs van Duin <[email protected]>
Date: Thu, 16 Feb 2017 01:05:04 +0100
Subject: ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build

From: Matthijs van Duin <[email protected]>

commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 upstream.

'adr' yields a data-pointer, not a function-pointer.

Fixes 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary

CPU in HYP mode")

---
 arch/arm/mach-omap2/omap-headsmp.S |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap-headsmp.S +2 -1
@@ -17,6 +17,7 @@
 
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 
 #include "omap44xx.h"
 
@@ -56,7 +57,7 @@ wait_2:	ldr	r2, =AUX_CORE_BOOT0_PA	@ rea
 	cmp	r0, r4
 	bne	wait_2
 	ldr	r12, =API_HYP_ENTRY
-	adr	r0, hyp_boot
+	badr	r0, hyp_boot
 	smc	#0
 hyp_boot:
 	b	secondary_startup

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch