Skip to contentSkip to conversation

Revert "of: Fix premature bootconsole disable with 'stdout-path'"

PATCH In review Peter Hurley 3 participants 3 messages Mar 17, 2015 – Mar 18, 2015 Device tree

lore
Share & tools
lore

Peter Hurley

author
#0 lore raw

PATCH 1/1 Revert "of: Fix premature bootconsole disable with 'stdout-path'"

This reverts commit 2fa645cb2703d9b3786d850db815414dfeefa51d.

The assumption that at least 1 preferred console will be registered when the stdout-path property is set is invalid, which can result in _no_ consoles.

Signed-off-by Peter Hurley <[email protected]>
---
 drivers/of/base.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/of/base.c +1 -3
index adb8764..8b904e5 100644
@@ -1893,10 +1893,8 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 			name = of_get_property(of_chosen, "linux,stdout-path", NULL);
 		if (IS_ENABLED(CONFIG_PPC) && !name)
 			name = of_get_property(of_aliases, "stdout", NULL);
-		if (name) {
+		if (name)
 			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
-			add_preferred_console("stdout-path", 0, NULL);
-		}
 	}
 
 	if (!of_aliases)
Signature · 1 line
2.3.3
#1 lore raw
Quoted 7 lines · Peter Hurley

This reverts commit 2fa645cb2703d9b3786d850db815414dfeefa51d.

The assumption that at least 1 preferred console will be registered when the stdout-path property is set is invalid, which can result in _no_ consoles.

Signed-off-by Peter Hurley <[email protected]>

Grant/Rob, in case you didn't see it, this has caused a panic on at least one powerpc box. So would be nice if it could go in for 4.0.

cheers

maintainer
#2 lore raw
Quoted 11 lines · Michael Ellerman
Quoted 7 lines · Peter Hurley

This reverts commit 2fa645cb2703d9b3786d850db815414dfeefa51d.

The assumption that at least 1 preferred console will be registered when the stdout-path property is set is invalid, which can result in _no_ consoles.

Signed-off-by Peter Hurley <[email protected]>

Grant/Rob, in case you didn't see it, this has caused a panic on at least one powerpc box. So would be nice if it could go in for 4.0.

Yes, I'm well aware of it and it will go in this week.

Rob