powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
authorRussell Currey <ruscur@russell.cc>
Wed, 27 Mar 2019 03:35:54 +0000 (14:35 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 May 2019 13:46:18 +0000 (06:46 -0700)
commitfec8a09f79ec1d96c2a1c1760b8acade1042312c
treef778ef4bb6ffd3a95648fb7f252b576311fc90f5
parentf488832c2099f292f1d2b17dae897bff3bfaed7c
powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX

[ Upstream commit 56c46bba9bbfe229b4472a5be313c44c5b714a39 ]

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: 1e0fc9d1eb2b ("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>
arch/powerpc/kernel/head_64.S