Commit bd0ddcfc authored by Rob Herring's avatar Rob Herring
Browse files

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



This reverts commit a7d550f8.

Some arches (PPC at least) don't call early_init_dt_scan_nodes(), so
moving the cmdline processing there breaks them.

Reported-by: default avatarGeoff Levand <geoff@infradead.org>
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Tested-by: default avatarGeoff Levand <geoff@infradead.org>
Reviewed-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Link: https://lore.kernel.org/r/20230103-dt-cmdline-fix-v1-1-7038e88b18b6@kernel.org


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

drivers/of/fdt.c

+20 −20
Original line number Diff line number Diff line
@@ -1175,6 +1175,26 @@ 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);
@@ -1279,26 +1299,6 @@ 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();