* patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing
@ 2017-04-18 16:00 gregkh
2017-05-17 15:51 ` Timur Tabi
0 siblings, 1 reply; 5+ messages in thread
From: gregkh @ 2017-04-18 16:00 UTC (permalink / raw)
To: timur, gregkh, shankerd, stable
This is a note to let you know that I've just added the patch titled
tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44
to my tty git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-testing branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will be merged to the tty-next branch sometime soon,
after it passes testing, and the merge window is open.
If you have any questions about this process, please let me know.
>From 5a0722b898f851b9ef108ea7babc529e4efc773d Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@codeaurora.org>
Date: Thu, 13 Apr 2017 08:55:08 -0500
Subject: tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44
Define a new early console name for Qualcomm Datacenter Technologies
QDF2400 SOCs affected by erratum 44, instead of piggy-backing on "pl011".
Previously, to enable traditional (non-SPCR) earlycon, the documentation
said to specify "earlycon=pl011,<address>,qdf2400_e44", but the code was
broken and this didn't actually work.
So instead, the method for specifying the E44 work-around with traditional
earlycon is "earlycon=qdf2400_e44,<address>". Both methods of earlycon
are now enabled with the same function.
Fixes: e53e597fd4c4 ("tty: pl011: fix earlycon work-around for QDF2400 erratum 44")
Signed-off-by: Timur Tabi <timur@codeaurora.org>
Cc: stable <stable@vger.kernel.org> # 4.11
Tested-by: Shanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/tty/serial/amba-pl011.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 37257badcb97..8a857bb34fbb 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2475,19 +2475,34 @@ static int __init pl011_early_console_setup(struct earlycon_device *device,
if (!device->port.membase)
return -ENODEV;
- /* On QDF2400 SOCs affected by Erratum 44, the "qdf2400_e44" must
- * also be specified, e.g. "earlycon=pl011,<address>,qdf2400_e44".
- */
- if (!strcmp(device->options, "qdf2400_e44"))
- device->con->write = qdf2400_e44_early_write;
- else
- device->con->write = pl011_early_write;
+ device->con->write = pl011_early_write;
return 0;
}
OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup);
OF_EARLYCON_DECLARE(pl011, "arm,sbsa-uart", pl011_early_console_setup);
-EARLYCON_DECLARE(qdf2400_e44, pl011_early_console_setup);
+
+/*
+ * On Qualcomm Datacenter Technologies QDF2400 SOCs affected by
+ * Erratum 44, traditional earlycon can be enabled by specifying
+ * "earlycon=qdf2400_e44,<address>". Any options are ignored.
+ *
+ * Alternatively, you can just specify "earlycon", and the early console
+ * will be enabled with the information from the SPCR table. In this
+ * case, the SPCR code will detect the need for the E44 work-around,
+ * and set the console name to "qdf2400_e44".
+ */
+static int __init
+qdf2400_e44_early_console_setup(struct earlycon_device *device,
+ const char *opt)
+{
+ if (!device->port.membase)
+ return -ENODEV;
+
+ device->con->write = qdf2400_e44_early_write;
+ return 0;
+}
+EARLYCON_DECLARE(qdf2400_e44, qdf2400_e44_early_console_setup);
#else
#define AMBA_CONSOLE NULL
--
2.12.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing
2017-04-18 16:00 patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing gregkh
@ 2017-05-17 15:51 ` Timur Tabi
2017-05-17 16:16 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Timur Tabi @ 2017-05-17 15:51 UTC (permalink / raw)
To: gregkh, shankerd, stable
On 04/18/2017 11:00 AM, gregkh@linuxfoundation.org wrote:
> From 5a0722b898f851b9ef108ea7babc529e4efc773d Mon Sep 17 00:00:00 2001
> From: Timur Tabi <timur@codeaurora.org>
> Date: Thu, 13 Apr 2017 08:55:08 -0500
> Subject: tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44
>
> Define a new early console name for Qualcomm Datacenter Technologies
> QDF2400 SOCs affected by erratum 44, instead of piggy-backing on "pl011".
> Previously, to enable traditional (non-SPCR) earlycon, the documentation
> said to specify "earlycon=pl011,<address>,qdf2400_e44", but the code was
> broken and this didn't actually work.
>
> So instead, the method for specifying the E44 work-around with traditional
> earlycon is "earlycon=qdf2400_e44,<address>". Both methods of earlycon
> are now enabled with the same function.
>
> Fixes: e53e597fd4c4 ("tty: pl011: fix earlycon work-around for QDF2400 erratum 44")
> Signed-off-by: Timur Tabi <timur@codeaurora.org>
> Cc: stable <stable@vger.kernel.org> # 4.11
Is there a way to know which stable kernel this patch will be added to? I
don't see it in 4.11.1, even though this patch was posted before 4.11.1 was
released.
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/log/drivers/tty/serial/amba-pl011.c?h=linux-4.11.y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing
2017-05-17 15:51 ` Timur Tabi
@ 2017-05-17 16:16 ` Greg KH
2017-05-17 18:02 ` Timur Tabi
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2017-05-17 16:16 UTC (permalink / raw)
To: Timur Tabi; +Cc: shankerd, stable
On Wed, May 17, 2017 at 10:51:14AM -0500, Timur Tabi wrote:
> On 04/18/2017 11:00 AM, gregkh@linuxfoundation.org wrote:
> > From 5a0722b898f851b9ef108ea7babc529e4efc773d Mon Sep 17 00:00:00 2001
> > From: Timur Tabi <timur@codeaurora.org>
> > Date: Thu, 13 Apr 2017 08:55:08 -0500
> > Subject: tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44
> >
> > Define a new early console name for Qualcomm Datacenter Technologies
> > QDF2400 SOCs affected by erratum 44, instead of piggy-backing on "pl011".
> > Previously, to enable traditional (non-SPCR) earlycon, the documentation
> > said to specify "earlycon=pl011,<address>,qdf2400_e44", but the code was
> > broken and this didn't actually work.
> >
> > So instead, the method for specifying the E44 work-around with traditional
> > earlycon is "earlycon=qdf2400_e44,<address>". Both methods of earlycon
> > are now enabled with the same function.
> >
> > Fixes: e53e597fd4c4 ("tty: pl011: fix earlycon work-around for QDF2400 erratum 44")
> > Signed-off-by: Timur Tabi <timur@codeaurora.org>
> > Cc: stable <stable@vger.kernel.org> # 4.11
>
> Is there a way to know which stable kernel this patch will be added to? I
> don't see it in 4.11.1, even though this patch was posted before 4.11.1 was
> released.
>
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/log/drivers/tty/serial/amba-pl011.c?h=linux-4.11.y
I have a queue of 300+ patches to get into the 4.11.y kernel tree,
please be patient as I dig through them...
You will be notified when it is queued up.
Is there some special rush for this to get in right now?
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing
2017-05-17 16:16 ` Greg KH
@ 2017-05-17 18:02 ` Timur Tabi
2017-05-17 20:50 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Timur Tabi @ 2017-05-17 18:02 UTC (permalink / raw)
To: Greg KH; +Cc: shankerd, stable
On 05/17/2017 11:16 AM, Greg KH wrote:
> I have a queue of 300+ patches to get into the 4.11.y kernel tree,
> please be patient as I dig through them...
>
> You will be notified when it is queued up.
>
> Is there some special rush for this to get in right now?
No, not at all. I just wanted to know if there's any kind of mapping of
commits that move from 4.12.x and 4.11.y, like y >= x + 2 or something.
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing
2017-05-17 18:02 ` Timur Tabi
@ 2017-05-17 20:50 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-05-17 20:50 UTC (permalink / raw)
To: Timur Tabi; +Cc: shankerd, stable
On Wed, May 17, 2017 at 01:02:18PM -0500, Timur Tabi wrote:
> On 05/17/2017 11:16 AM, Greg KH wrote:
> > I have a queue of 300+ patches to get into the 4.11.y kernel tree,
> > please be patient as I dig through them...
> >
> > You will be notified when it is queued up.
> >
> > Is there some special rush for this to get in right now?
>
> No, not at all. I just wanted to know if there's any kind of mapping of
> commits that move from 4.12.x and 4.11.y, like y >= x + 2 or something.
Nope, it all depends on the time it hits Linus's tree and a real
release, combined with all of the other pending patches, combined with
my travel schedule and other workload tasks...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-17 20:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 16:00 patch "tty: pl011: use "qdf2400_e44" as the earlycon name for QDF2400 E44" added to tty-testing gregkh
2017-05-17 15:51 ` Timur Tabi
2017-05-17 16:16 ` Greg KH
2017-05-17 18:02 ` Timur Tabi
2017-05-17 20:50 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.