From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF5EDC5CFEB for ; Wed, 11 Jul 2018 18:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DEC920C51 for ; Wed, 11 Jul 2018 18:32:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DEC920C51 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388384AbeGKSi0 (ORCPT ); Wed, 11 Jul 2018 14:38:26 -0400 Received: from mail.bootlin.com ([62.4.15.54]:37115 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732381AbeGKSi0 (ORCPT ); Wed, 11 Jul 2018 14:38:26 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 57CD920741; Wed, 11 Jul 2018 20:32:51 +0200 (CEST) Received: from localhost (unknown [88.191.26.124]) by mail.bootlin.com (Postfix) with ESMTPSA id 2D4B2203D9; Wed, 11 Jul 2018 20:32:41 +0200 (CEST) From: Alexandre Belloni To: Russell King Cc: Nicolas Pitre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Belloni 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> X-Mailer: git-send-email 2.18.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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