From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42328 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbdEIJWn (ORCPT ); Tue, 9 May 2017 05:22:43 -0400 Subject: Patch "tty: serial: pl011: add ttyAMA for matching pl011 console" has been added to the 4.10-stable tree To: sudeep.holla@arm.com, aleksey.makarov@linaro.org, gregkh@linuxfoundation.org, jslaby@suse.com, linux@armlinux.org.uk, peter@hurleysoftware.com Cc: , From: Date: Tue, 09 May 2017 11:21:06 +0200 Message-ID: <1494321666214104@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tty: serial: pl011: add ttyAMA for matching pl011 console to the 4.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch and it can be found in the queue-4.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Wed, 1 Feb 2017 15:46:38 +0000 Subject: tty: serial: pl011: add ttyAMA for matching pl011 console From: Sudeep Holla commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b upstream. Commit c7cef0a84912 ("console: Add extensible console matching") added match() method to struct console which allows the console to perform console command line matching instead of (or in addition to) default console matching (ie., by fixed name and index). Commit ad1696f6f09d ("ACPI: parse SPCR and enable matching console") introduced support for SPCR as matching console. Commit 10879ae5f12e ("serial: pl011: add console matching function") added the match method for pl011 console which checks for the console string to be "pl011" Now on a platform which has both SPCR in the ACPI tables and ttyAMA in the command line, the ttyAMA is chosen as "selected console" but it doesn't pass the matching console method which results in CON_CONSDEV not being set on the "selected console". As a result of that, the bootconsole(SPCR in the above case) is not unregistered and all the beginning boot messages are seen twice. This patch adds "ttyAMA" so that it's considered to match pl011 console. Fixes: 10879ae5f12e ("serial: pl011: add console matching function") Cc: Russell King Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Peter Hurley Cc: Aleksey Makarov Signed-off-by: Sudeep Holla Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/amba-pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2340,7 +2340,7 @@ static int __init pl011_console_match(st resource_size_t addr; int i; - if (strcmp(name, "pl011") != 0) + if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) return -ENODEV; if (uart_parse_earlycon(options, &iotype, &addr, &options)) Patches currently in stable-queue which might be from sudeep.holla@arm.com are queue-4.10/arm64-remove-wrong-config_proc_sysctl-ifdef.patch queue-4.10/tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch