Unverified Commit d0e4dae7 authored by Bin Meng's avatar Bin Meng Committed by Palmer Dabbelt
Browse files

riscv: Fix 32-bit RISC-V boot failure 



Commit dd2d082b ("riscv: Cleanup setup_bootmem()") adjusted
the calling sequence in setup_bootmem(), which invalidates the fix
commit de043da0 ("RISC-V: Fix usage of memblock_enforce_memory_limit")
did for 32-bit RISC-V unfortunately.

So now 32-bit RISC-V does not boot again when testing booting kernel
on QEMU 'virt' with '-m 2G', which was exactly what the original
commit de043da0 ("RISC-V: Fix usage of memblock_enforce_memory_limit")
tried to fix.

Fixes: dd2d082b ("riscv: Cleanup setup_bootmem()")
Signed-off-by: default avatarBin Meng <bmeng.cn@gmail.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 6efb943b

arch/riscv/mm/init.c

+3 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void __init setup_bootmem(void) 
{

	phys_addr_t vmlinux_end = __pa_symbol(&_end);

	phys_addr_t vmlinux_start = __pa_symbol(&_start);

	phys_addr_t dram_end = memblock_end_of_DRAM();

	phys_addr_t dram_end;

	phys_addr_t max_mapped_addr = __pa(~(ulong)0);



#ifdef CONFIG_XIP_KERNEL
@@ -146,6 +146,8 @@ void __init setup_bootmem(void) 
#endif

	memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);



	dram_end = memblock_end_of_DRAM();



	/*

	 * memblock allocator is not aware of the fact that last 4K bytes of

	 * the addressable memory can not be mapped because of IS_ERR_VALUE