[Skiboot] [PATCH] Revert "console(lpc/fsp-console): Use only stdout-path property on P9 and above"

[Stewart Smith]

This reverts commit 20f685a3627a2a522c465716377561a8fbcc608f.

We've hit problems on Zaius machines and the needed petitboot changes
haven't made it upstream yet.

Let's revert for the time being while we sort everything out.

We probably have to keep both around for a few years.

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 core/console.c       | 16 +++++++---------
 core/init.c          |  5 +----
 hw/fsp/fsp-console.c | 14 +++-----------
 hw/lpc-uart.c        | 14 +++-----------
 4 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/core/console.c b/core/console.c
index d9b48cd5fd32..b9129c9f3766 100644
--- a/core/console.c
+++ b/core/console.c
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 IBM Corp.
+/* Copyright 2013-2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -427,18 +427,16 @@ static void dummy_console_poll(void *data __unused)
 
 void dummy_console_add_nodes(void)
 {
+	struct dt_property *p;
+
 	add_opal_console_node(0, "raw", memcons.obuf_size);
 
 	/* Mambo might have left a crap one, clear it */
-	dt_check_del_prop(dt_chosen, "stdout-path");
-	dt_check_del_prop(dt_chosen, "linux,stdout-path");
-
-	if (proc_gen < proc_gen_p9) {
-		dt_add_property_string(dt_chosen, "linux,stdout-path",
-				       "/ibm,opal/consoles/serial at 0");
-	}
+	p = __dt_find_property(dt_chosen, "linux,stdout-path");
+	if (p)
+		dt_del_property(dt_chosen, p);
 
-	dt_add_property_string(dt_chosen, "stdout-path",
+	dt_add_property_string(dt_chosen, "linux,stdout-path",
 			       "/ibm,opal/consoles/serial at 0");
 
 	opal_add_poller(dummy_console_poll, NULL);
diff --git a/core/init.c b/core/init.c
index 83f42f5c64fc..a60b784350f0 100644
--- a/core/init.c
+++ b/core/init.c
@@ -549,10 +549,7 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
 	cpu_set_ipi_enable(false);
 
 	/* Dump the selected console */
-	if (proc_gen >= proc_gen_p9)
-		stdoutp = dt_prop_get_def(dt_chosen, "stdout-path", NULL);
-	else
-		stdoutp = dt_prop_get_def(dt_chosen, "linux,stdout-path", NULL);
+	stdoutp = dt_prop_get_def(dt_chosen, "linux,stdout-path", NULL);
 	prlog(PR_DEBUG, "INIT: stdout-path: %s\n", stdoutp ? stdoutp : "");
 
 
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index fc092ce6e1dc..8d845d835afe 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 IBM Corp.
+/* Copyright 2013-2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1072,22 +1072,14 @@ void fsp_console_select_stdout(void)
 			 */
 		}
 	}
-
 	dt_check_del_prop(dt_chosen, "linux,stdout-path");
-	dt_check_del_prop(dt_chosen, "stdout-path");
 
 	if (fsp_serials[1].open && use_serial) {
-		if (proc_gen < proc_gen_p9)
-			dt_add_property_string(dt_chosen, "linux,stdout-path",
-                                       "/ibm,opal/consoles/serial at 1");
-		dt_add_property_string(dt_chosen, "stdout-path",
+		dt_add_property_string(dt_chosen, "linux,stdout-path",
 				       "/ibm,opal/consoles/serial at 1");
 		prlog(PR_NOTICE, "FSPCON: default console set to serial A\n");
 	} else {
-		if (proc_gen < proc_gen_p9)
-			dt_add_property_string(dt_chosen, "linux,stdout-path",
-					       "/ibm,opal/consoles/serial at 0");
-		dt_add_property_string(dt_chosen, "stdout-path",
+		dt_add_property_string(dt_chosen, "linux,stdout-path",
 				       "/ibm,opal/consoles/serial at 0");
 		prlog(PR_NOTICE, "FSPCON: default console set to SOL/DVS\n");
 	}
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index ea71ac5ca09e..3224de9f7c0f 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 IBM Corp.
+/* Copyright 2013-2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -438,12 +438,7 @@ static void uart_setup_os_passthrough(void)
 
 	dt_add_property_strings(uart_node, "status", "ok");
 	path = dt_get_path(uart_node);
-
-
-	dt_add_property_string(dt_chosen, "stdout-path", path);
-	if (proc_gen < proc_gen_p9)
-		dt_add_property_string(dt_chosen, "linux,stdout-path", path);
-
+	dt_add_property_string(dt_chosen, "linux,stdout-path", path);
 	free(path);
 
 	/* Setup LPC client for OS interrupts */
@@ -465,11 +460,8 @@ static void uart_setup_opal_console(void)
 	/* Add the opal console node */
 	add_opal_console_node(0, "raw", OUT_BUF_SIZE);
 
-	dt_add_property_string(dt_chosen, "stdout-path",
+	dt_add_property_string(dt_chosen, "linux,stdout-path",
 			       "/ibm,opal/consoles/serial at 0");
-	if (proc_gen < proc_gen_p9)
-		dt_add_property_string(dt_chosen, "linux,stdout-path",
-				       "/ibm,opal/consoles/serial at 0");
 
 	/*
 	 * We mark the UART as reserved since we don't want the
-- 
2.14.3