Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nios2: reserve boot memory for device tree

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().

Cc: stable@vger.kernel.org
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>

authored by

Tobias Klauser and committed by
Ley Foon Tan
921d701e a71c9a1c

+10
+7
arch/nios2/kernel/prom.c
··· 48 48 return alloc_bootmem_align(size, align); 49 49 } 50 50 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 + 51 58 void __init early_init_devtree(void *params) 52 59 { 53 60 __be32 *dtb = (u32 *)__dtb_start;
+3
arch/nios2/kernel/setup.c
··· 201 201 } 202 202 #endif /* CONFIG_BLK_DEV_INITRD */ 203 203 204 + early_init_fdt_reserve_self(); 205 + early_init_fdt_scan_reserved_mem(); 206 + 204 207 unflatten_and_copy_device_tree(); 205 208 206 209 setup_cpuinfo();