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

Message ID 20170301152304.29635-1-aleksey.makarov@linaro.org
State Accepted
Commit b767ad726c2aa6219318bf0da83fbe690e653d9a
Headers show

Commit Message

Aleksey Makarov March 1, 2017, 3:23 p.m.
The original patch makes the condition always true, so it is wrong.

It masks (but not fixes) the bug described in the commit message
but introduces a regression (no console is selected by SPCR)
in regular (no 'console=ttyAMA') case.

s/||/&&/ would not fix the problem as the root cause was identified
incorrectly.

This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>

---

v3: fix commit message (Robin Murphy)
v2: add Signed-off-by:

 drivers/tty/serial/amba-pl011.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.11.1

Comments

Aleksey Makarov March 16, 2017, 9:31 a.m. | #1
On 03/16/2017 10:11 AM, Jayachandran C. wrote:
> Hi Greg,

> 

> On Tue, Mar 14, 2017 at 9:44 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

>>

>>

>> On 01/03/17 15:23, Aleksey Makarov wrote:

>>> The original patch makes the condition always true, so it is wrong.

>>>

>>> It masks (but not fixes) the bug described in the commit message

>>> but introduces a regression (no console is selected by SPCR)

>>> in regular (no 'console=ttyAMA') case.

>>>

>>> s/||/&&/ would not fix the problem as the root cause was identified

>>> incorrectly.

>>>

>>> This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b.

>>>

>>

>> Sorry for that, I will test your patches and respond to that. For this

>> patch:

>>

>> Acked-by: Sudeep Holla <sudeep.holla@arm.com>

>>

> 

> This fixes a regression I see in v4.11-rc2

> 

> Tested-by: Jayachandran C <jnair@caviumnetworks.com>

> 

> I don't see it in the tty/serial tree yet


It's commit 713b93f1b849 from tty-next branch of 
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git

So it looks like it is scheduled for 4.12

Greg, this is a fix for regression.  Can it be applied to 4.11-rcX?

Thank you
Aleksey Makarov

> 

> JC.

> --

> To unsubscribe from this list: send the line "unsubscribe linux-serial" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

>
Greg Kroah-Hartman March 17, 2017, 5:04 a.m. | #2
On Thu, Mar 16, 2017 at 12:31:53PM +0300, Aleksey Makarov wrote:
> 

> 

> On 03/16/2017 10:11 AM, Jayachandran C. wrote:

> > Hi Greg,

> > 

> > On Tue, Mar 14, 2017 at 9:44 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

> >>

> >>

> >> On 01/03/17 15:23, Aleksey Makarov wrote:

> >>> The original patch makes the condition always true, so it is wrong.

> >>>

> >>> It masks (but not fixes) the bug described in the commit message

> >>> but introduces a regression (no console is selected by SPCR)

> >>> in regular (no 'console=ttyAMA') case.

> >>>

> >>> s/||/&&/ would not fix the problem as the root cause was identified

> >>> incorrectly.

> >>>

> >>> This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b.

> >>>

> >>

> >> Sorry for that, I will test your patches and respond to that. For this

> >> patch:

> >>

> >> Acked-by: Sudeep Holla <sudeep.holla@arm.com>

> >>

> > 

> > This fixes a regression I see in v4.11-rc2

> > 

> > Tested-by: Jayachandran C <jnair@caviumnetworks.com>

> > 

> > I don't see it in the tty/serial tree yet

> 

> It's commit 713b93f1b849 from tty-next branch of 

> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git

> 

> So it looks like it is scheduled for 4.12

> 

> Greg, this is a fix for regression.  Can it be applied to 4.11-rcX?


Yes, will do that now, thanks.

greg k-h

Patch

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 8789ea423ccf..56f92d7348bf 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2373,7 +2373,7 @@  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;
 	}