Commit a7d550f8 authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Rob Herring
Browse files

of: fdt: Honor CONFIG_CMDLINE* even without /chosen node 



I do not read a strict requirement on /chosen node in either ePAPR or in
Documentation/devicetree. Help text for CONFIG_CMDLINE and
CONFIG_CMDLINE_EXTEND doesn't make their behavior explicitly dependent on
the presence of /chosen or the presense of /chosen/bootargs.

However the early check for /chosen and bailing out in
early_init_dt_scan_chosen() skips CONFIG_CMDLINE handling which is not
really related to /chosen node or the particular method of passing cmdline
from bootloader.

This leads to counterintuitive combinations (assuming
CONFIG_CMDLINE_EXTEND=y):

a) bootargs="foo", CONFIG_CMDLINE="bar" => cmdline=="foo bar"
b) /chosen missing, CONFIG_CMDLINE="bar" => cmdline==""
c) bootargs="", CONFIG_CMDLINE="bar" => cmdline==" bar"

Move CONFIG_CMDLINE handling outside of early_init_dt_scan_chosen() so that
cases b and c above result in the same cmdline.

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/11af73e05bad75e4ef49067515e3214f6d944b3d.camel@gmail.com


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 71a7507a

drivers/of/fdt.c

+20 −20
Original line number Diff line number Diff line
@@ -1173,26 +1173,6 @@ int __init early_init_dt_scan_chosen(char *cmdline) 
	if (p != NULL && l > 0)

		strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));



	/*

	 * CONFIG_CMDLINE is meant to be a default in case nothing else

	 * managed to set the command line, unless CONFIG_CMDLINE_FORCE

	 * is set in which case we override whatever was found earlier.

	 */

#ifdef CONFIG_CMDLINE

#if defined(CONFIG_CMDLINE_EXTEND)

	strlcat(cmdline, " ", COMMAND_LINE_SIZE);

	strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#elif defined(CONFIG_CMDLINE_FORCE)

	strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#else

	/* No arguments from boot loader, use kernel's  cmdl*/

	if (!((char *)cmdline)[0])

		strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif

#endif /* CONFIG_CMDLINE */



	pr_debug("Command line is: %s\n", (char *)cmdline);



	rng_seed = of_get_flat_dt_prop(node, "rng-seed", &l);

	if (rng_seed && l > 0) {

		add_bootloader_randomness(rng_seed, l);
@@ -1297,6 +1277,26 @@ void __init early_init_dt_scan_nodes(void) 
	if (rc)

		pr_warn("No chosen node found, continuing without\n");



	/*

	 * CONFIG_CMDLINE is meant to be a default in case nothing else

	 * managed to set the command line, unless CONFIG_CMDLINE_FORCE

	 * is set in which case we override whatever was found earlier.

	 */

#ifdef CONFIG_CMDLINE

#if defined(CONFIG_CMDLINE_EXTEND)

	strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);

	strlcat(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#elif defined(CONFIG_CMDLINE_FORCE)

	strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#else

	/* No arguments from boot loader, use kernel's cmdl */

	if (!boot_command_line[0])

		strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif

#endif /* CONFIG_CMDLINE */



	pr_debug("Command line is: %s\n", boot_command_line);



	/* Setup memory, calling early_init_dt_add_memory_arch */

	early_init_dt_scan_memory();