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

Commit 56c46bba authored by Russell Currey's avatar Russell Currey Committed by Michael Ellerman
Browse files

powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX 



With STRICT_KERNEL_RWX enabled anything marked __init is placed at a 16M
boundary.  This is necessary so that it can be repurposed later with
different permissions.  However, in kernels with text larger than 16M,
this pushes early_setup past 32M, incapable of being reached by the
branch instruction.

Fix this by setting the CTR and branching there instead.

Fixes: 1e0fc9d1 ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs")
Signed-off-by: default avatarRussell Currey <ruscur@russell.cc>
[mpe: Fix it to work on BE by using DOTSYM()]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 62611c1e

arch/powerpc/kernel/head_64.S

+3 −1
Original line number Diff line number Diff line
@@ -968,7 +968,9 @@ start_here_multiplatform: 


	/* Restore parameters passed from prom_init/kexec */

	mr	r3,r31

	bl	early_setup		/* also sets r13 and SPRG_PACA */

	LOAD_REG_ADDR(r12, DOTSYM(early_setup))

	mtctr	r12

	bctrl		/* also sets r13 and SPRG_PACA */



	LOAD_REG_ADDR(r3, start_here_common)

	ld	r4,PACAKMSR(r13)