Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753245AbdCAQSJ (ORCPT ); Wed, 1 Mar 2017 11:18:09 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:36521 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbdCAQRw (ORCPT ); Wed, 1 Mar 2017 11:17:52 -0500 From: Aleksey Makarov To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Aleksey Makarov , Sudeep Holla , Greg Kroah-Hartman , Peter Hurley , Jiri Slaby , Robin Murphy , Petr Mladek , Sergey Senozhatsky , Steven Rostedt Subject: [PATCH 2/2] printk: fix double printing with earlycon Date: Wed, 1 Mar 2017 19:13:46 +0300 Message-Id: <20170301161347.4202-3-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170301161347.4202-1-aleksey.makarov@linaro.org> References: <20170301161347.4202-1-aleksey.makarov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3245 Lines: 105 If a console was specified by ACPI SPCR table _and_ command line parameters like "console=ttyAMA0" _and_ "earlycon" were specified, then log messages appears twice. The root cause is that the code traverse the list of specified consoles (the `console_cmdline` array) and stops at the first match. But it may happen that the same console is referred by the elements of this array twice: ttyAMA0 -- from command line pl011,mmio,0x87e024000000,115200 -- from SPCR but in this case `preferred_console` points to the second entry and the flag CON_CONSDEV is not set, so bootconsole is not deregistered. To fix that, match the console against the `console_cmdline` entry pointed by `preferred_console` instead of the first match. Signed-off-by: Aleksey Makarov --- kernel/printk/printk.c | 52 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ed2a9b31f214..92008ae9db3f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2380,6 +2380,24 @@ static int __init keep_bootcon_setup(char *str) early_param("keep_bootcon", keep_bootcon_setup); +static int match_console(struct console *newcon, struct console_cmdline *c) +{ + if (!newcon->match || + newcon->match(newcon, c->name, c->index, c->options) != 0) { + /* default matching */ + BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name)); + if (strcmp(c->name, newcon->name) != 0) + return -ENODEV; + if (newcon->index >= 0 && + newcon->index != c->index) + return -ENODEV; + if (newcon->index < 0) + newcon->index = c->index; + } + + return 0; +} + /* * The console driver calls this routine during kernel initialization * to register the console printing procedure with printk() and to @@ -2460,37 +2478,29 @@ void register_console(struct console *newcon) for (i = 0, c = console_cmdline; i < MAX_CMDLINECONSOLES && c->name[0]; i++, c++) { - if (!newcon->match || - newcon->match(newcon, c->name, c->index, c->options) != 0) { - /* default matching */ - BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name)); - if (strcmp(c->name, newcon->name) != 0) - continue; - if (newcon->index >= 0 && - newcon->index != c->index) - continue; - if (newcon->index < 0) - newcon->index = c->index; + if (match_console(newcon, c)) + continue; - if (_braille_register_console(newcon, c)) - return; + if (_braille_register_console(newcon, c)) + return; - if (newcon->setup && - newcon->setup(newcon, c->options) != 0) - break; - } + if (newcon->setup && + newcon->setup(newcon, c->options) != 0) + break; newcon->flags |= CON_ENABLED; - if (i == preferred_console) { - newcon->flags |= CON_CONSDEV; - has_preferred = true; - } break; } if (!(newcon->flags & CON_ENABLED)) return; + if (preferred_console >= 0 && + match_console(newcon, console_cmdline + preferred_console) == 0) { + newcon->flags |= CON_CONSDEV; + has_preferred = true; + } + /* * If we have a bootconsole, and are switching to a real console, * don't print everything out again, since when the boot console, and -- 2.11.1