Patch "tty: serial: pl011: add ttyAMA for matching pl011 console" has been added to the 4.10-stable tree

* Patch "tty: serial: pl011: add ttyAMA for matching pl011 console" has been added to the 4.10-stable tree
@ 2017-05-09  9:21 gregkh
  2017-05-09  9:32 ` Sudeep Holla
  0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2017-05-09  9:21 UTC (permalink / raw)
  To: sudeep.holla, aleksey.makarov, gregkh, jslaby, linux, peter
  Cc: stable, stable-commits


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 <stable@vger.kernel.org> know about it.


>From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001
From: Sudeep Holla <sudeep.holla@arm.com>
Date: Wed, 1 Feb 2017 15:46:38 +0000
Subject: tty: serial: pl011: add ttyAMA for matching pl011 console

From: Sudeep Holla <sudeep.holla@arm.com>

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 <linux@armlinux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Aleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 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

^ permalink raw reply	[flat|nested] 4+ messages in thread