| Message ID | 1426625193-5055-1-git-send-email-peter@hurleysoftware.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, 2015-03-17 at 16:46 -0400, Peter Hurley wrote: > 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 <peter@hurleysoftware.com> 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
On Tue, Mar 17, 2015 at 11:47 PM, Michael Ellerman <mpe@ellerman.id.au> wrote: > On Tue, 2015-03-17 at 16:46 -0400, Peter Hurley wrote: >> 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 <peter@hurleysoftware.com> > > 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
diff --git a/drivers/of/base.c b/drivers/of/base.c index adb8764..8b904e5 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -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)
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 <peter@hurleysoftware.com> --- drivers/of/base.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)