Patch "riscv: always honor the CONFIG_CMDLINE_FORCE when parsing dtb" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    riscv: always honor the CONFIG_CMDLINE_FORCE when parsing dtb

to the 5.10-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-always-honor-the-config_cmdline_force-when-par.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 2c967e87d16194adbf78dfc575762eb3f5d226e5
Author: Wenting Zhang <zephray@xxxxxxxxxxx>
Date:   Fri Jul 8 16:38:22 2022 -0400

    riscv: always honor the CONFIG_CMDLINE_FORCE when parsing dtb
    
    [ Upstream commit 10f6913c548b32ecb73801a16b120e761c6957ea ]
    
    When CONFIG_CMDLINE_FORCE is enabled, cmdline provided by
    CONFIG_CMDLINE are always used. This allows CONFIG_CMDLINE to be
    used regardless of the result of device tree scanning.
    
    This especially fixes the case where a device tree without the
    chosen node is supplied to the kernel. In such cases,
    early_init_dt_scan would return true. But inside
    early_init_dt_scan_chosen, the cmdline won't be updated as there
    is no chosen node in the device tree. As a result, CONFIG_CMDLINE
    is not copied into boot_command_line even if CONFIG_CMDLINE_FORCE
    is enabled. This commit allows properly update boot_command_line
    in this situation.
    
    Fixes: 8fd6e05c7463 ("arch: riscv: support kernel command line forcing when no DTB passed")
    Signed-off-by: Wenting Zhang <zephray@xxxxxxxxxxx>
    Reviewed-by: Björn Töpel <bjorn@xxxxxxxxxx>
    Reviewed-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/PSBPR04MB399135DFC54928AB958D0638B1829@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    Cc: stable@xxxxxxxxxxxxxxx
    Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 5d17d3ce36fd..cc85858f7fe8 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -61,10 +61,10 @@ static void __init parse_dtb(void)
 			pr_info("Machine model: %s\n", name);
 			dump_stack_set_arch_desc("%s (DT)", name);
 		}
-		return;
+	} else {
+		pr_err("No DTB passed to the kernel\n");
 	}
 
-	pr_err("No DTB passed to the kernel\n");
 #ifdef CONFIG_CMDLINE_FORCE
 	strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
 	pr_info("Forcing kernel command line to: %s\n", boot_command_line);