[PATCH] powerpc: Look for "stdout-path" when setting up legacy consoles

[PATCH] powerpc: Look for "stdout-path" when setting up legacy consoles

[Benjamin Herrenschmidt]

Commit 78e5dfea8 "powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'"
broke the default console on a number of embedded PowerPC systems, because it
failed to also update the code in arch/powerpc/kernel/legacy_serial.c to
look for that property in addition to the old one.

This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Fixes: 78e5dfea8 powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'
---
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 33b34a5..5b9dce1 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -372,6 +372,8 @@ void __init find_legacy_serial_ports(void)
 
 	/* Now find out if one of these is out firmware console */
 	path = of_get_property(of_chosen, "linux,stdout-path", NULL);
+	if (path == NULL)
+		path = of_get_property(of_chosen, "stdout-path", NULL);
 	if (path != NULL) {
 		stdout = of_find_node_by_path(path);
 		if (stdout)
@@ -595,8 +597,10 @@ static int __init check_legacy_serial_console(void)
 	/* We are getting a weird phandle from OF ... */
 	/* ... So use the full path instead */
 	name = of_get_property(of_chosen, "linux,stdout-path", NULL);
+	if (name == NULL)
+		name = of_get_property(of_chosen, "stdout-path", NULL);
 	if (name == NULL) {
-		DBG(" no linux,stdout-path !\n");
+		DBG(" no stdout-path !\n");
 		return -ENODEV;
 	}
 	prom_stdout = of_find_node_by_path(name);

Re: [PATCH] powerpc: Look for "stdout-path" when setting up legacy consoles

[Rob Herring]

On Thu, Nov 29, 2018 at 9:54 PM Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Commit 78e5dfea8 "powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'"
> broke the default console on a number of embedded PowerPC systems, because it
> failed to also update the code in arch/powerpc/kernel/legacy_serial.c to
> look for that property in addition to the old one.
>
> This fixes it.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Fixes: 78e5dfea8 powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'

Reviewed-by: Rob Herring <robh@kernel.org>

Re: powerpc: Look for "stdout-path" when setting up legacy consoles

[Michael Ellerman]

On Fri, 2018-11-30 at 03:54:09 UTC, Benjamin Herrenschmidt wrote:
> Commit 78e5dfea8 "powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'"
> broke the default console on a number of embedded PowerPC systems, because it
> failed to also update the code in arch/powerpc/kernel/legacy_serial.c to
> look for that property in addition to the old one.
> 
> This fixes it.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Fixes: 78e5dfea8 powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'
> Reviewed-by: Rob Herring <robh@kernel.org>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/bf3d6afbb234156749b640b6c50f71

cheers