From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756810AbdHYNO6 (ORCPT ); Fri, 25 Aug 2017 09:14:58 -0400 Received: from smtprelay.synopsys.com ([198.182.60.111]:59379 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756796AbdHYNO5 (ORCPT ); Fri, 25 Aug 2017 09:14:57 -0400 From: Eugeniy Paltsev To: Petr Mladek , Sergey Senozhatsky Cc: Steven Rostedt , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, Eugeniy Paltsev Subject: [PATCH] console: don't select first registered console if stdout-path used Date: Fri, 25 Aug 2017 16:14:51 +0300 Message-Id: <20170825131451.15944-1-Eugeniy.Paltsev@synopsys.com> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the current implementation we take the first console that registers if we didn't select one. But if we specify console via "stdout-path" property in device tree we don't want first console that registers here to be selected. Otherwise we may choose wrong console - for example if some console is registered earlier than console is pointed in "stdout-path" property because console pointed in "stdout-path" property can be add as preferred quite late - when it's driver is probed. Signed-off-by: Eugeniy Paltsev --- kernel/printk/printk.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 512f7c2..23262c1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -2431,6 +2432,16 @@ void register_console(struct console *newcon) if (!has_preferred || bcon || !console_drivers) has_preferred = preferred_console >= 0; + + /* + * If we specify console via "stdout-path" property in device tree + * we don't want first console that registers here to be selected. + */ +#ifdef CONFIG_OF + if (of_stdout) + has_preferred = true; +#endif + /* * See if we want to use this console driver. If we * didn't select a console we take the first one -- 2.9.3