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

Commit 1146b600 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: sunxi: fix build for THUMB2_KERNEL 



Building an SMP kernel for the sunxi platform with THUMB2 instructions
fails with this error at the moment:

headsmp.S:7: Error: Thumb encoding does not support an immediate here -- `msr cpsr_fsxc,#0xd3'

Since the generic secondary_startup function already does
the same thing in a safe way, we can just drop the private
sunxi implementation and jump straight to secondary_startup.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
parent 96c3a250

arch/arm/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct secondary_data { 
};

extern struct secondary_data secondary_data;

extern volatile int pen_release;

extern void secondary_startup(void);



extern int __cpu_disable(void);

arch/arm/mach-sunxi/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_SUNXI) += sunxi.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o
 
obj-$(CONFIG_SMP) += platsmp.o

arch/arm/mach-sunxi/headsmp.S

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#include <linux/linkage.h>

#include <linux/init.h>



        .section ".text.head", "ax"



ENTRY(sun6i_secondary_startup)

	msr	cpsr_fsxc, #0xd3

	b	secondary_startup

ENDPROC(sun6i_secondary_startup)

arch/arm/mach-sunxi/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu, 
	spin_lock(&cpu_lock);



	/* Set CPU boot address */

	writel(virt_to_phys(sun6i_secondary_startup),

	writel(virt_to_phys(secondary_startup),

	       cpucfg_membase + CPUCFG_PRIVATE0_REG);



	/* Assert the CPU core in reset */