Re: [PATCH 2/3] powerpc: convert to generic builtin command line

[maksym.kokhan@globallogic.com: add strlcat to prom_init_check.sh
whitelist]
Cc: Daniel Walker <redacted>
Cc: Daniel Walker <redacted>
Cc: xe-linux-external@cisco.com
Signed-off-by: Daniel Walker <redacted>
Signed-off-by: Maksym Kokhan <redacted>
---
  arch/powerpc/Kconfig                   | 23 +----------------------
  arch/powerpc/kernel/prom.c             |  4 ++++
  arch/powerpc/kernel/prom_init.c        |  8 ++++----
  arch/powerpc/kernel/prom_init_check.sh |  2 +-
  4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8be31261aec8..6321b2a0b87b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig

@@ -172,6 +172,7 @@ config PPC
  	select GENERIC_STRNCPY_FROM_USER
  	select GENERIC_STRNLEN_USER
  	select GENERIC_TIME_VSYSCALL
+	select GENERIC_CMDLINE
  	select HAVE_ARCH_AUDITSYSCALL
  	select HAVE_ARCH_JUMP_LABEL
  	select HAVE_ARCH_KGDB

@@ -777,28 +778,6 @@ config PPC_DENORMALISATION
  	  Add support for handling denormalisation of single precision
  	  values.  Useful for bare metal only.  If unsure say Y here.
  
-config CMDLINE_BOOL
-	bool "Default bootloader kernel arguments"
-
-config CMDLINE
-	string "Initial kernel command string"
-	depends on CMDLINE_BOOL
-	default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
-	help
-	  On some platforms, there is currently no way for the boot loader to
-	  pass arguments to the kernel. For these platforms, you can supply
-	  some command-line options at build time by entering them here.  In
-	  most cases you will need to specify the root device here.
-
-config CMDLINE_FORCE
-	bool "Always use the default kernel command string"
-	depends on CMDLINE_BOOL
-	help
-	  Always use the default kernel command string, even if the boot
-	  loader passes other arguments to the kernel.
-	  This is useful if you cannot or don't want to change the
-	  command-line options your boot loader passes to the kernel.
-
  config EXTRA_TARGETS
  	string "Additional default image types"
  	help

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index fe758cedb93f..d78b1d6fe1c8 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c

@@ -34,6 +34,7 @@
  #include <linux/of_fdt.h>
  #include <linux/libfdt.h>
  #include <linux/cpu.h>
+#include <linux/cmdline.h>
  
  #include <asm/prom.h>
  #include <asm/rtas.h>

@@ -716,6 +717,9 @@ void __init early_init_devtree(void *params)
  	 */
  	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line);
  
+	/* append and prepend any arguments built into the kernel. */
+	cmdline_add_builtin(boot_command_line, NULL, COMMAND_LINE_SIZE);
+

  	/* Scan memory nodes and rebuild MEMBLOCKs */
  	of_scan_flat_dt(early_init_dt_scan_root, NULL);
  	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index f33ff4163a51..e8e9fca22470 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c

@@ -30,6 +30,7 @@
  #include <linux/delay.h>
  #include <linux/initrd.h>
  #include <linux/bitops.h>
+#include <linux/cmdline.h>
  #include <asm/prom.h>
  #include <asm/rtas.h>
  #include <asm/page.h>

@@ -637,11 +638,10 @@ static void __init early_cmdline_parse(void)
  	p = prom_cmd_line;
  	if ((long)prom.chosen > 0)
  		l = prom_getprop(prom.chosen, "bootargs", p, COMMAND_LINE_SIZE-1);
-#ifdef CONFIG_CMDLINE
+
  	if (l <= 0 || p[0] == '\0') /* dbl check */
-		strlcpy(prom_cmd_line,
-			CONFIG_CMDLINE, sizeof(prom_cmd_line));
-#endif /* CONFIG_CMDLINE */
+		cmdline_add_builtin_section(prom_cmd_line, NULL, sizeof(prom_cmd_line), __prombss);
+

  	prom_printf("command line: %s\n", prom_cmd_line);
  
  #ifdef CONFIG_PPC64

diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 667df97d2595..ab2acc8d8b5a 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh

@@ -18,7 +18,7 @@
  
  WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush
  _end enter_prom memcpy memset reloc_offset __secondary_hold
-__secondary_hold_acknowledge __secondary_hold_spinloop __start
+__secondary_hold_acknowledge __secondary_hold_spinloop __start strlcat