of: Fix premature bootconsole disable with 'stdout-path'
PATCH 1/1 of: Fix premature bootconsole disable with 'stdout-path'
Support for devicetree serial consoles via 'stdout-path' causes bootconsoles to be disabled when the vt dummy console loads, since there is no preferred console (the preferred console is not added until the device is probed).
Ensure there is at least a preferred console, even if never matched.
Requires: "console: Fix console name size mismatch"
--- drivers/of/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/of/base.c +3 -1
@@ -1885,8 +1885,10 @@ 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 · 6 lines
2.3.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425230482-6423-1-git-send-email-peter-WaGBZJeGNqdsbIuE7sb01tBPR1lH4CV8@public.gmane.org
Quoted 10 lines · Peter Hurley
Support for devicetree serial consoles via 'stdout-path' causes bootconsoles to be disabled when the vt dummy console loads, since there is no preferred console (the preferred console is not added until the device is probed).
Ensure there is at least a preferred console, even if never matched.
Requires: "console: Fix console name size mismatch"
Cc Andrew Morton <akpm-de/[email protected]>Signed-off-by Peter Hurley <[email protected]>
Applied for 4.0. Thanks.
Rob
Quoted 21 lines
--- drivers/of/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/of/base.c +3
-2@@ -1885,8 +1885,10 @@ 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) --
Quoted 2 lines
2.3.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html