Skip to content

Commit 1c47303

Browse files
tklausergregkh
authored andcommitted
nios2: reserve boot memory for device tree
commit 921d701e6f31e1ffaca3560416af1aa04edb4c4f upstream. Make sure to reserve the boot memory for the flattened device tree. Otherwise it might get overwritten, e.g. when initial_boot_params is copied, leading to a corrupted FDT and a boot hang/crash: bootconsole [early0] enabled Early console on uart16650 initialized at 0xf8001600 OF: fdt: Error -11 processing FDT Kernel panic - not syncing: setup_cpuinfo: No CPU found in devicetree! ---[ end Kernel panic - not syncing: setup_cpuinfo: No CPU found in devicetree! Guenter Roeck says: > I think I found the problem. In unflatten_and_copy_device_tree(), with added > debug information: > > OF: fdt: initial_boot_params=c861e400, dt=c861f000 size=28874 (0x70ca) > > ... and then initial_boot_params is copied to dt, which results in corrupted > fdt since the memory overlaps. Looks like the initial_boot_params memory > is not reserved and (re-)allocated by early_init_dt_alloc_memory_arch(). Reported-by: Guenter Roeck <linux@roeck-us.net> Reference: http://lkml.kernel.org/r/20170226210338.GA19476@roeck-us.net Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <ley.foon.tan@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ca9bd55 commit 1c47303

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

arch/nios2/kernel/prom.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
4848
return alloc_bootmem_align(size, align);
4949
}
5050

51+
int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
52+
bool nomap)
53+
{
54+
reserve_bootmem(base, size, BOOTMEM_DEFAULT);
55+
return 0;
56+
}
57+
5158
void __init early_init_devtree(void *params)
5259
{
5360
__be32 *dtb = (u32 *)__dtb_start;

arch/nios2/kernel/setup.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ void __init setup_arch(char **cmdline_p)
195195
}
196196
#endif /* CONFIG_BLK_DEV_INITRD */
197197

198+
early_init_fdt_reserve_self();
199+
early_init_fdt_scan_reserved_mem();
200+
198201
unflatten_and_copy_device_tree();
199202

200203
setup_cpuinfo();

0 commit comments

Comments
 (0)