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

Commit bafe5865 authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King
Browse files

ARM: 8302/1: Add a secondary_startup that assumes ARM mode 



Some platforms always enter the kernel in ARM mode even if the
kernel is compiled for THUMB2. Add a small wrapper on top of
secondary_startup() that switches into THUMB2 mode.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ada63d40

arch/arm/kernel/head.S

+7 −0
Original line number Diff line number Diff line
@@ -346,6 +346,12 @@ __turn_mmu_on_loc: 


#if defined(CONFIG_SMP)

	.text

ENTRY(secondary_startup_arm)

	.arm

 THUMB(	adr	r9, BSYM(1f)	)	@ Kernel is entered in ARM.

 THUMB(	bx	r9		)	@ If this is a Thumb-2 kernel,

 THUMB(	.thumb			)	@ switch to Thumb now.

 THUMB(1:			)

ENTRY(secondary_startup)

	/*

	 * Common entry point for secondary CPUs.
@@ -385,6 +391,7 @@ ENTRY(secondary_startup) 
 THUMB(	add	r12, r10, #PROCINFO_INITFUNC	)

 THUMB(	ret	r12				)

ENDPROC(secondary_startup)

ENDPROC(secondary_startup_arm)



	/*

	 * r6  = &secondary_data