* [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'"
@ 2015-03-17 20:46 Peter Hurley
2015-03-18 4:47 ` Michael Ellerman
0 siblings, 1 reply; 3+ messages in thread
From: Peter Hurley @ 2015-03-17 20:46 UTC (permalink / raw)
To: Rob Herring, Grant Likely
Cc: devicetree, Greg Kroah-Hartman, Pranith Kumar, Michael Ellerman,
linuxppc-dev, linux-kernel, 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 <peter@hurleysoftware.com>
---
drivers/of/base.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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)
--
2.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'"
2015-03-17 20:46 [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'" Peter Hurley
@ 2015-03-18 4:47 ` Michael Ellerman
2015-03-18 13:05 ` Rob Herring
0 siblings, 1 reply; 3+ messages in thread
From: Michael Ellerman @ 2015-03-18 4:47 UTC (permalink / raw)
To: Peter Hurley
Cc: Rob Herring, Grant Likely, devicetree, Greg Kroah-Hartman,
Pranith Kumar, linuxppc-dev, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'"
2015-03-18 4:47 ` Michael Ellerman
@ 2015-03-18 13:05 ` Rob Herring
0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2015-03-18 13:05 UTC (permalink / raw)
To: Michael Ellerman
Cc: Peter Hurley, Grant Likely, devicetree@vger.kernel.org,
Greg Kroah-Hartman, Pranith Kumar, linuxppc-dev,
linux-kernel@vger.kernel.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-18 13:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-17 20:46 [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'" Peter Hurley
2015-03-18 4:47 ` Michael Ellerman
2015-03-18 13:05 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).