Re: [PATCH 2/8] CMDLINE: drivers: of: ifdef out cmdline section
From: Christophe Leroy <hidden>
Date: 2021-04-02 17:32:37
Also in:
linux-mips, linuxppc-dev, lkml
Le 30/03/2021 à 19:56, Daniel Walker a écrit :
quoted hunk ↗ jump to hunk
It looks like there's some seepage of cmdline stuff into the generic device tree code. This conflicts with the generic cmdline implementation so I remove it in the case when that's enabled. Cc: xe-linux-external@cisco.com Signed-off-by: Ruslan Ruslichenko <redacted> Signed-off-by: Daniel Walker <redacted> --- drivers/of/fdt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index dcc1dd96911a..d8805cd9717a 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c@@ -25,6 +25,7 @@ #include <linux/serial_core.h> #include <linux/sysfs.h> #include <linux/random.h> +#include <linux/cmdline.h> #include <asm/setup.h> /* for COMMAND_LINE_SIZE */ #include <asm/page.h>@@ -1050,6 +1051,18 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, /* Retrieve command line */ p = of_get_flat_dt_prop(node, "bootargs", &l); + +#if defined(CONFIG_GENERIC_CMDLINE) && defined(CONFIG_GENERIC_CMDLINE_OF) + /* + * The builtin command line will be added here, or it can override + * with the DT bootargs. + */ + cmdline_add_builtin(data, + (l > 0 ? p : NULL), /* This is sanity checking */ + COMMAND_LINE_SIZE); +#elif defined(CONFIG_GENERIC_CMDLINE) + strlcpy(data, p, COMMAND_LINE_SIZE); +#else
Ugly. Linux codying style recommend to limit the use of #ifdefs to headers as much as possible. Why do we need so many alternatives ? Allthough they are temporary, can we order the changes in another way to reduce that ?
quoted hunk ↗ jump to hunk
if (p != NULL && l > 0) strlcpy(data, p, min(l, COMMAND_LINE_SIZE));@@ -1070,6 +1083,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #endif #endif /* CONFIG_CMDLINE */ +#endif /* CONFIG_GENERIC_CMDLINE */ pr_debug("Command line is: %s\n", (char *)data);