[PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Mark Salter <msalter@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"
Date	Thu, 16 Mar 2017 18:00:01 +0100
Message-ID	<tlGUN-197-1@gated-at.bofh.it> (permalink)
Dmarc-Filter	OpenDMARC Filter v1.3.2 mx1.redhat.com 15B9B624D4
Authentication-Results	ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results	ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=msalter@redhat.com
Dkim-Filter	OpenDKIM Filter v2.11.0 mx1.redhat.com 15B9B624D4
X-Scanned-By	MIMEDefang 2.79 on 10.5.11.13
X-Greylist	Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Mar 2017 16:51:51 +0000 (UTC)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	40
Organization	linux.* mail to news gateway
X-Original-Cc	Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla <sudeep.holla@arm.com>
X-Original-Date	Thu, 16 Mar 2017 12:51:34 -0400
X-Original-Message-ID	<20170316165134.1501-1-msalter@redhat.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1602659

Show key headers only | View raw

This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b.

It completely breaks PL011 SPCR support (a console=ttyAMA0 is
required to get a console even with a valid SPCR table).

Aleksey Makarov also noticed this:

  https://lkml.org/lkml/2017/3/1/324

and he is working on a more generalized patch to fix the original
"double printing" problem which this reverted patch was trying to
fix.

  https://lkml.org/lkml/2017/3/15/223

So, let's revert the broken patch and live with the double printing
until Aleksey's patch gets upstream.

Signed-off-by: Mark Salter <msalter@redhat.com>
---
 drivers/tty/serial/amba-pl011.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 8789ea4..a81631f 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2373,9 +2373,8 @@ static int __init pl011_console_match(struct console *co, char *name, int idx,
 	if (strcmp(name, "qdf2400_e44") == 0) {
 		pr_info_once("UART: Working around QDF2400 SoC erratum 44");
 		qdf2400_e44_present = true;
-	} else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) {
+	} else if (strcmp(name, "pl011") != 0)
 		return -ENODEV;
-	}
 
 	if (uart_parse_earlycon(options, &iotype, &addr, &options))
 		return -ENODEV;
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Mark Salter <msalter@redhat.com> - 2017-03-16 18:00 +0100
  Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching  pl011 console" Mark Salter <msalter@redhat.com> - 2017-03-16 18:30 +0100

csiph-web