This is a note to let you know that I've just added the patch titled
riscv: Do not set initial_boot_params to the linear address of the dtb
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Apr 28 12:32:18 2023
From: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
Date: Fri, 28 Apr 2023 12:29:27 +0200
Subject: riscv: Do not set initial_boot_params to the linear address of the dtb
To: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>, stable@xxxxxxxxxxxxxxx
Cc: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>, Palmer Dabbelt <palmer@xxxxxxxxxxxx>
Message-ID: <20230428102928.16470-3-alexghiti@xxxxxxxxxxxx>
From: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx>
commit f1581626071c8e37c58c5e8f0b4126b17172a211 upstream.
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@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230329081932.79831-3-alexghiti@xxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx # 6.1.x
Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/riscv/kernel/setup.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -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();
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.1/riscv-no-need-to-relocate-the-dtb-as-it-lies-in-the-fixmap-region.patch
queue-6.1/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch
queue-6.1/riscv-move-early-dtb-mapping-into-the-fixmap-region.patch
