summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-04-20 16:34:31 +0300
committerBen Hutchings <ben@decadent.org.uk>2016-06-15 23:29:28 +0300
commitb5752ee2fab8340a7544c11635b227a2865f2933 (patch)
tree3596ce75b7cc6bcec56f3fe3090e92741d4426e6
parent94488e8c61f5e76713c8cb59638134c7bb839916 (diff)
downloadlinux-b5752ee2fab8340a7544c11635b227a2865f2933.tar.xz
ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel
commit 5616f36713ea77f57ae908bf2fef641364403c9f upstream. The secondary CPU starts up in ARM mode. When the kernel is compiled in thumb2 mode we have to explicitly compile the secondary startup trampoline in ARM mode, otherwise the CPU will go to Nirvana. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reported-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--arch/arm/mach-socfpga/headsmp.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 95c115d8b5ee..b143f946bb79 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -11,6 +11,7 @@
#include <linux/init.h>
.arch armv7-a
+ .arm
ENTRY(secondary_trampoline)
movw r2, #:lower16:cpu1start_addr