Skip to content

Commit

Permalink
powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
Browse files Browse the repository at this point in the history
[ Upstream commit 56c46bb ]

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: 1e0fc9d ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs")
Signed-off-by: Russell Currey <ruscur@russell.cc>
[mpe: Fix it to work on BE by using DOTSYM()]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
ruscur authored and gregkh committed May 31, 2019
1 parent 6678905 commit a66c556
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/powerpc/kernel/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,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)
Expand Down

0 comments on commit a66c556

Please sign in to comment.