From 7fd2795a4b824643bd04513891fbd5e23101ec8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=89=9B=20=E5=BF=97=E5=AE=8F?= Date: Fri, 13 Jun 2025 01:45:28 +0000 Subject: [PATCH] bootm: Pass SMP core ID and DTB address for ELF-formatted kernels When booting RISC-V ELF-formatted kernel images (IH_TYPE_KERNEL + IH_OS_ELF), explicitly pass SMP hart ID (via a0/argc) and DTB address (via a1/argv) to comply with modern SMP-enabled kernels' boot protocol requirements. See https://www.kernel.org/doc/html/latest/arch/riscv/boot.html#register-state Signed-off-by: Zone.N --- boot/bootm_os.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/boot/bootm_os.c b/boot/bootm_os.c index a3c7cb5332e..88f7c183867 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -402,6 +402,17 @@ static int do_bootm_elf(int flag, struct bootm_info *bmi) if (flag != BOOTM_STATE_OS_GO) return 0; + /* + * Required per RISC-V boot protocol: + * a0(argc) = hartid of the current core + * a1(argv) = address of the devicetree in memory + * https://www.kernel.org/doc/html/latest/arch/riscv/boot.html#register-state + */ +#if defined(CONFIG_RISCV) + bmi->argc = gd->arch.boot_hart; + bmi->argv = (char **)bmi->images->ft_addr; +#endif + bootelf(bmi->images->ep, flags, bmi->argc, bmi->argv); return 1; -- 2.47.2