| Message ID | d3aa7c5adee1e3cedeb65661545c82d30faafc8f.camel@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bf3d6afbb234156749b640b6c50f714967a85964 |
| Headers | show |
| Series | powerpc: Look for "stdout-path" when setting up legacy consoles | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/build-ppc64le | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | fail | total: 1 errors, 1 warnings, 0 checks, 19 lines checked |
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>
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);
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' ---