Skip to contentSkip to conversation

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

PATCH [email protected] 2 participants 4 messages May 9, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001

From: Sudeep Holla <[email protected]>
Date: Wed, 1 Feb 2017 15:46:38 +0000
Subject: tty: serial: pl011: add ttyAMA for matching pl011 console

From: Sudeep Holla <[email protected]>

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 <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc Peter Hurley <[email protected]>
Cc Aleksey Makarov <[email protected]>
---
 drivers/tty/serial/amba-pl011.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/amba-pl011.c +1 -1
@@ -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 [email protected] 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

#1 lore raw

Hi Greg,

Quoted 16 lines · On 09/05/17 10:21, [email protected] wrote:

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 <[email protected]> know about it.

Quoted 9 lines

From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001
From: Sudeep Holla <[email protected]>
Date: Wed, 1 Feb 2017 15:46:38 +0000
Subject: tty: serial: pl011: add ttyAMA for matching pl011 console

From: Sudeep Holla <[email protected]>

commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b upstream.

I am not sure on the procedure for stable tree, but thought I will let you know the information on this.

Commit b767ad726c2a ("Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"") reverted the above commit(commit in $subject)

It was properly fixed in the following upstream commits:

cf39bf58afda ("printk: fix double printing with earlycon") ad86ee2b8a47 ("printk: rename selected_console -> preferred_console") b077bafa2f38 ("printk: fix name/type/scope of preferred_console var")

Sorry for the trouble.

Signature · 2 lines
Regards,
Sudeep
author maintainer
#2 lore raw
Quoted 35 lines · Sudeep Holla

Hi Greg,

Quoted 16 lines · On 09/05/17 10:21, [email protected] wrote:

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 <[email protected]> know about it.

Quoted 9 lines

From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001
From: Sudeep Holla <[email protected]>
Date: Wed, 1 Feb 2017 15:46:38 +0000
Subject: tty: serial: pl011: add ttyAMA for matching pl011 console

From: Sudeep Holla <[email protected]>

commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b upstream.

I am not sure on the procedure for stable tree, but thought I will let you know the information on this.

Commit b767ad726c2a ("Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"") reverted the above commit(commit in $subject)

Quoted 7 lines

It was properly fixed in the following upstream commits:

cf39bf58afda ("printk: fix double printing with earlycon") ad86ee2b8a47 ("printk: rename selected_console -> preferred_console") b077bafa2f38 ("printk: fix name/type/scope of preferred_console var")

Sorry for the trouble.

No trouble at all, thanks for letting me know. I've dropped the tty patch now and will look at adding the printk ones instead.

thanks,

greg k-h

author maintainer
#3 lore raw
Quoted 38 lines · Greg KH
Quoted 37 lines · Sudeep Holla

Hi Greg,

Quoted 16 lines · On 09/05/17 10:21, [email protected] wrote:

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 <[email protected]> know about it.

Quoted 9 lines

From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001
From: Sudeep Holla <[email protected]>
Date: Wed, 1 Feb 2017 15:46:38 +0000
Subject: tty: serial: pl011: add ttyAMA for matching pl011 console

From: Sudeep Holla <[email protected]>

commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b upstream.

I am not sure on the procedure for stable tree, but thought I will let you know the information on this.

Commit b767ad726c2a ("Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"") reverted the above commit(commit in $subject)

It was properly fixed in the following upstream commits:

Quoted 8 lines
Quoted 5 lines

cf39bf58afda ("printk: fix double printing with earlycon") ad86ee2b8a47 ("printk: rename selected_console -> preferred_console") b077bafa2f38 ("printk: fix name/type/scope of preferred_console var")

Sorry for the trouble.

No trouble at all, thanks for letting me know. I've dropped the tty patch now and will look at adding the printk ones instead.

Hm, as the printk patches will be in 4.12-rc1, I'll wait for that to be out before considering them.

thanks,

greg k-h