riscv: Do not set initial_boot_params to the linear address of the dtb
authorAlexandre Ghiti <alexghiti@rivosinc.com>
Wed, 29 Mar 2023 08:19:31 +0000 (10:19 +0200)
committerPalmer Dabbelt <palmer@rivosinc.com>
Fri, 14 Apr 2023 01:14:33 +0000 (18:14 -0700)
early_init_dt_verify() is already called in parse_dtb() and since the dtb
address does not change anymore (it is now in the fixmap region), no need
to reset initial_boot_params by calling early_init_dt_verify() again.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20230329081932.79831-3-alexghiti@rivosinc.com
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/kernel/setup.c

index 542eed8..a059b73 100644 (file)
@@ -278,10 +278,7 @@ void __init setup_arch(char **cmdline_p)
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
        unflatten_and_copy_device_tree();
 #else
-       if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))
-               unflatten_device_tree();
-       else
-               pr_err("No DTB found in kernel mappings\n");
+       unflatten_device_tree();
 #endif
        misc_mem_init();