]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
powerpc: Fix early setup to make early_ioremap() work
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Thu, 20 May 2021 03:29:19 +0000 (13:29 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 20 May 2021 06:43:26 +0000 (16:43 +1000)
commite2f5efd0f0e229bd110eab513e7c0331d61a4649
treee76abd9031895dad3b1b086390570f12fdad4c8b
parentd07f6ca923ea0927a1024dfccafc5b53b61cfecc
powerpc: Fix early setup to make early_ioremap() work

The immediate problem is that after commit
0bd3f9e953bd ("powerpc/legacy_serial: Use early_ioremap()") the kernel
silently reboots on some systems.

The reason is that early_ioremap() returns broken addresses as it uses
slot_virt[] array which initialized with offsets from FIXADDR_TOP ==
IOREMAP_END+FIXADDR_SIZE == KERN_IO_END - FIXADDR_SIZ + FIXADDR_SIZE ==
__kernel_io_end which is 0 when early_ioremap_setup() is called.
__kernel_io_end is initialized little bit later in early_init_mmu().

This fixes the initialization by swapping early_ioremap_setup() and
early_init_mmu().

Fixes: 265c3491c4bc ("powerpc: Add support for GENERIC_EARLY_IOREMAP")
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Drop unrelated cleanup & cleanup change log]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210520032919.358935-1-aik@ozlabs.ru
arch/powerpc/kernel/setup_64.c