Unverified Commit 1bfb2b61 authored by Song Shuai's avatar Song Shuai Committed by Palmer Dabbelt
Browse files

riscv: kexec: Align the kexeced kernel entry 



The current riscv boot protocol requires 2MB alignment for RV64
and 4MB alignment for RV32.

In KEXEC_FILE path, the elf_find_pbase() function should align
the kexeced kernel entry according to the requirement, otherwise
the kexeced kernel would silently BUG at the setup_vm().

Fixes: 8acea455 ("RISC-V: Support for kexec_file on panic")
Signed-off-by: default avatarSong Shuai <songshuaishuai@tinylab.org>
Link: https://lore.kernel.org/r/20230906095817.364390-1-songshuaishuai@tinylab.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 0bb80ecc

arch/riscv/kernel/elf_kexec.c

+7 −1
Original line number Diff line number Diff line
@@ -98,7 +98,13 @@ static int elf_find_pbase(struct kimage *image, unsigned long kernel_len, 
	kbuf.image = image;

	kbuf.buf_min = lowest_paddr;

	kbuf.buf_max = ULONG_MAX;

	kbuf.buf_align = PAGE_SIZE;



	/*

	 * Current riscv boot protocol requires 2MB alignment for

	 * RV64 and 4MB alignment for RV32

	 *

	 */

	kbuf.buf_align = PMD_SIZE;

	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;

	kbuf.memsz = ALIGN(kernel_len, PAGE_SIZE);

	kbuf.top_down = false;