OSDN Git Service

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)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 20 Apr 2019 12:02:12 +0000 (22:02 +1000)
commit56c46bba9bbfe229b4472a5be313c44c5b714a39
tree2774a129f5696d9167a8500a1f1d25671f93b96b
parent62611c1e241878c538211d80cefef9de72030b56
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: 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>
arch/powerpc/kernel/head_64.S