* [PATCH] tty: serial: amba-pl011: Fix removal of the QDF2xxx workarounds [not found] <CGME20240131213600eucas1p12ecf4d6fb101425fa35e50f45a241c84@eucas1p1.samsung.com> @ 2024-01-31 21:35 ` Marek Szyprowski 2024-02-01 11:29 ` Thierry Reding 0 siblings, 1 reply; 3+ messages in thread From: Marek Szyprowski @ 2024-01-31 21:35 UTC (permalink / raw) To: linux-kernel Cc: Marek Szyprowski, Russell King, Greg Kroah-Hartman, Jiri Slaby, Konrad Dybcio Commit 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx workarounds") removed some quirks specific to QDF2xxx SoC family. Unfortunately it removed a bit too much code from the pl011_console_match() function, what broke console operation on QEMU's 'virt' ARM/ARM64 machines. Restore the "pl011" related string check as it was originally introduced in the commit 10879ae5f12e ("serial: pl011: add console matching function"). Fixes: 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx workarounds") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/tty/serial/amba-pl011.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index c4df9cbc264b..33d559fa10a6 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2451,6 +2451,9 @@ static int pl011_console_match(struct console *co, char *name, int idx, resource_size_t addr; int i; + if (strcmp(name, "pl011") != 0) + return -ENODEV; + if (uart_parse_earlycon(options, &iotype, &addr, &options)) return -ENODEV; -- 2.34.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tty: serial: amba-pl011: Fix removal of the QDF2xxx workarounds 2024-01-31 21:35 ` [PATCH] tty: serial: amba-pl011: Fix removal of the QDF2xxx workarounds Marek Szyprowski @ 2024-02-01 11:29 ` Thierry Reding 2024-03-07 21:45 ` Greg Kroah-Hartman 0 siblings, 1 reply; 3+ messages in thread From: Thierry Reding @ 2024-02-01 11:29 UTC (permalink / raw) To: Marek Szyprowski, linux-kernel Cc: Russell King, Greg Kroah-Hartman, Jiri Slaby, Konrad Dybcio On Wed Jan 31, 2024 at 10:35 PM CET, Marek Szyprowski wrote: > Commit 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx > workarounds") removed some quirks specific to QDF2xxx SoC family. > Unfortunately it removed a bit too much code from the > pl011_console_match() function, what broke console operation on QEMU's > 'virt' ARM/ARM64 machines. Restore the "pl011" related string check as it > was originally introduced in the commit 10879ae5f12e ("serial: pl011: add > console matching function"). > > Fixes: 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx workarounds") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > drivers/tty/serial/amba-pl011.c | 3 +++ > 1 file changed, 3 insertions(+) I was about to send out the same patch: Reviewed-by: Thierry Reding <treding@nvidia.com> ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tty: serial: amba-pl011: Fix removal of the QDF2xxx workarounds 2024-02-01 11:29 ` Thierry Reding @ 2024-03-07 21:45 ` Greg Kroah-Hartman 0 siblings, 0 replies; 3+ messages in thread From: Greg Kroah-Hartman @ 2024-03-07 21:45 UTC (permalink / raw) To: Thierry Reding Cc: Marek Szyprowski, linux-kernel, Russell King, Jiri Slaby, Konrad Dybcio On Thu, Feb 01, 2024 at 12:29:55PM +0100, Thierry Reding wrote: > On Wed Jan 31, 2024 at 10:35 PM CET, Marek Szyprowski wrote: > > Commit 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx > > workarounds") removed some quirks specific to QDF2xxx SoC family. > > Unfortunately it removed a bit too much code from the > > pl011_console_match() function, what broke console operation on QEMU's > > 'virt' ARM/ARM64 machines. Restore the "pl011" related string check as it > > was originally introduced in the commit 10879ae5f12e ("serial: pl011: add > > console matching function"). > > > > Fixes: 196f34af2bf4 ("tty: serial: amba-pl011: Remove QDF2xxx workarounds") > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > > --- > > drivers/tty/serial/amba-pl011.c | 3 +++ > > 1 file changed, 3 insertions(+) > > I was about to send out the same patch: > > Reviewed-by: Thierry Reding <treding@nvidia.com> Oops, I applied this, but will drop it, as it's already fixed up in my tree with a different commit. thanks, greg k-h ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-07 21:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20240131213600eucas1p12ecf4d6fb101425fa35e50f45a241c84@eucas1p1.samsung.com>
2024-01-31 21:35 ` [PATCH] tty: serial: amba-pl011: Fix removal of the QDF2xxx workarounds Marek Szyprowski
2024-02-01 11:29 ` Thierry Reding
2024-03-07 21:45 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox