* [PATCH] serial: pl011: add console matching function
@ 2016-10-04 7:15 Aleksey Makarov
2016-11-09 18:17 ` Timur Tabi
0 siblings, 1 reply; 3+ messages in thread
From: Aleksey Makarov @ 2016-10-04 7:15 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-serial, linux-kernel, Aleksey Makarov, Russell King,
Christopher Covington, Peter Hurley, Russell King, Jiri Slaby
This patch adds function pl011_console_match() that implements
method match of struct console. It allows to match consoles against
data specified in a string, for example taken from command line or
compiled by ACPI SPCR table handler.
This patch was merged to tty-next but then reverted because of
conflict with
commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")
Now it is fixed.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Tested-by: Christopher Covington <cov@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index e2c33b9..c00ab22 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2315,12 +2315,67 @@ static int __init pl011_console_setup(struct console *co, char *options)
return uart_set_options(&uap->port, co, baud, parity, bits, flow);
}
+/**
+ * pl011_console_match - non-standard console matching
+ * @co: registering console
+ * @name: name from console command line
+ * @idx: index from console command line
+ * @options: ptr to option string from console command line
+ *
+ * Only attempts to match console command lines of the form:
+ * console=pl011,mmio|mmio32,<addr>[,<options>]
+ * console=pl011,0x<addr>[,<options>]
+ * This form is used to register an initial earlycon boot console and
+ * replace it with the amba_console at pl011 driver init.
+ *
+ * Performs console setup for a match (as required by interface)
+ * If no <options> are specified, then assume the h/w is already setup.
+ *
+ * Returns 0 if console matches; otherwise non-zero to use default matching
+ */
+static int __init pl011_console_match(struct console *co, char *name, int idx,
+ char *options)
+{
+ unsigned char iotype;
+ resource_size_t addr;
+ int i;
+
+ if (strcmp(name, "pl011") != 0)
+ return -ENODEV;
+
+ if (uart_parse_earlycon(options, &iotype, &addr, &options))
+ return -ENODEV;
+
+ if (iotype != UPIO_MEM && iotype != UPIO_MEM32)
+ return -ENODEV;
+
+ /* try to match the port specified on the command line */
+ for (i = 0; i < ARRAY_SIZE(amba_ports); i++) {
+ struct uart_port *port;
+
+ if (!amba_ports[i])
+ continue;
+
+ port = &amba_ports[i]->port;
+
+ if (port->mapbase != addr)
+ continue;
+
+ co->index = i;
+ port->cons = co;
+ return pl011_console_setup(co, options);
+ }
+
+ return -ENODEV;
+}
+
static struct uart_driver amba_reg;
static struct console amba_console = {
.name = "ttyAMA",
.write = pl011_console_write,
.device = uart_console_device,
.setup = pl011_console_setup,
+ .match = pl011_console_match,
.flags = CON_PRINTBUFFER,
.index = -1,
.data = &amba_reg,
--
2.10.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] serial: pl011: add console matching function
2016-10-04 7:15 [PATCH] serial: pl011: add console matching function Aleksey Makarov
@ 2016-11-09 18:17 ` Timur Tabi
2016-11-09 19:34 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Timur Tabi @ 2016-11-09 18:17 UTC (permalink / raw)
To: Aleksey Makarov
Cc: Greg Kroah-Hartman, linux-serial, lkml, Russell King,
Christopher Covington, Peter Hurley, Russell King, Jiri Slaby
On Tue, Oct 4, 2016 at 2:15 AM, Aleksey Makarov
<aleksey.makarov@linaro.org> wrote:
> This patch adds function pl011_console_match() that implements
> method match of struct console. It allows to match consoles against
> data specified in a string, for example taken from command line or
> compiled by ACPI SPCR table handler.
>
> This patch was merged to tty-next but then reverted because of
> conflict with
>
> commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")
>
> Now it is fixed.
>
> Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
> Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
> Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
> Tested-by: Christopher Covington <cov@codeaurora.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Is there any chance this fix will make it into 4.9? It's been out for
over a month.
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] serial: pl011: add console matching function
2016-11-09 18:17 ` Timur Tabi
@ 2016-11-09 19:34 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2016-11-09 19:34 UTC (permalink / raw)
To: Timur Tabi
Cc: Aleksey Makarov, linux-serial, lkml, Russell King,
Christopher Covington, Peter Hurley, Russell King, Jiri Slaby
On Wed, Nov 09, 2016 at 12:17:18PM -0600, Timur Tabi wrote:
> On Tue, Oct 4, 2016 at 2:15 AM, Aleksey Makarov
> <aleksey.makarov@linaro.org> wrote:
> > This patch adds function pl011_console_match() that implements
> > method match of struct console. It allows to match consoles against
> > data specified in a string, for example taken from command line or
> > compiled by ACPI SPCR table handler.
> >
> > This patch was merged to tty-next but then reverted because of
> > conflict with
> >
> > commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")
> >
> > Now it is fixed.
> >
> > Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
> > Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
> > Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
> > Tested-by: Christopher Covington <cov@codeaurora.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> Is there any chance this fix will make it into 4.9? It's been out for
> over a month.
It's scheduled for 4.10-rc1 as it is a new feature.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-10 11:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-04 7:15 [PATCH] serial: pl011: add console matching function Aleksey Makarov
2016-11-09 18:17 ` Timur Tabi
2016-11-09 19:34 ` 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;
as well as URLs for NNTP newsgroup(s).