Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Alexandre Belloni <alexandre.belloni@bootlin.com>
To:     Russell King <linux@armlinux.org.uk>
Cc:     Nicolas Pitre <nicolas.pitre@linaro.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH] ARM: early_printk: respect keep parameter
Date:   Wed, 11 Jul 2018 20:32:39 +0200
Message-Id: <20180711183239.21023-1-alexandre.belloni@bootlin.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Parse and use the keep parameter of earlyprintk to avoid having the kernel
output stop with:

Console: colour dummy device 80x30
console [tty0] enabled
bootconsole [earlycon0] disabled

This happens because once tty0, the virtual terminal console is registered,
it is selected as the default console, disregarding an existing stdout-path
DT property and the early console is shutdown before the console driver is
probed.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 arch/arm/kernel/early_printk.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c
index 9257736ec9fa..bbb10150b11a 100644
--- a/arch/arm/kernel/early_printk.c
+++ b/arch/arm/kernel/early_printk.c
@@ -42,6 +42,9 @@ static struct console early_console_dev = {
 
 static int __init setup_early_printk(char *buf)
 {
+	if (buf && strstr(buf, "keep"))
+		early_console_dev.flags &= ~CON_BOOT;
+
 	early_console = &early_console_dev;
 	register_console(&early_console_dev);
 	return 0;
-- 
2.18.0