Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752853AbbDDO2A (ORCPT ); Sat, 4 Apr 2015 10:28:00 -0400 Received: from mail-qg0-f54.google.com ([209.85.192.54]:35756 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752299AbbDDO1y (ORCPT ); Sat, 4 Apr 2015 10:27:54 -0400 From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , Andrew Morton , linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linux-serial@vger.kernel.org, Rob Herring , Yinghai Lu , Peter Hurley Subject: [PATCH v3] earlycon: 8250: Fix command line regression Date: Sat, 4 Apr 2015 10:27:30 -0400 Message-Id: <1428157650-16418-1-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1428105875-4038-1-git-send-email-peter@hurleysoftware.com> References: <1428105875-4038-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7515 Lines: 197 Restore undocumented behavior of kernel command line parameters of the forms: console=uart[8250],io|mmio|mmio32,[,options] console=uart[8250],[,options] where 'options' have not been specified; in this case, the hardware is assumed to be initialized. Document the required behavior of the original implementation. Fixes: c7cef0a84912cab3c9df8 ("console: Add extensible console matching") Reported-by: Yinghai Lu Signed-off-by: Peter Hurley --- v3: Fixed automatic console to port line settings initialization; open-coded serial8250_console_setup() so the baud can be probed; added sha reference in commit log v2: Fixed regression which allowed "console=uart1337,..." to start a console (but not an earlycon) + fixed earlycon= documentation related required behavior fixed by this patch Documentation/kernel-parameters.txt | 18 ++++++++++++++--- drivers/tty/serial/8250/8250_core.c | 38 +++++++++++++++++++++++++++++++++--- drivers/tty/serial/8250/8250_early.c | 19 ------------------ 3 files changed, 50 insertions(+), 25 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index bfcb1a6..1facf0b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -713,10 +713,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted. uart[8250],io,[,options] uart[8250],mmio,[,options] + uart[8250],mmio32,[,options] + uart[8250],0x[,options] Start an early, polled-mode console on the 8250/16550 UART at the specified I/O port or MMIO address, - switching to the matching ttyS device later. The - options are the same as for ttyS, above. + switching to the matching ttyS device later. + MMIO inter-register address stride is either 8-bit + (mmio) or 32-bit (mmio32). + If none of [io|mmio|mmio32], is assumed to be + equivalent to 'mmio'. 'options' are specified in the + same format described for ttyS above; if unspecified, + the h/w is not re-initialized. + hvc Use the hypervisor console device . This is for both Xen and PowerPC hypervisors. @@ -944,11 +952,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. uart[8250],io,[,options] uart[8250],mmio,[,options] uart[8250],mmio32,[,options] + uart[8250],0x[,options] Start an early, polled-mode console on the 8250/16550 UART at the specified I/O port or MMIO address. MMIO inter-register address stride is either 8-bit (mmio) or 32-bit (mmio32). - The options are the same as for ttyS, above. + If none of [io|mmio|mmio32], is assumed to be + equivalent to 'mmio'. 'options' are specified in the + same format described for "console=ttyS"; if + unspecified, the h/w is not initialized. pl011, Start an early, polled-mode console on a pl011 serial diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index e0fb5f0..f59c7a0 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -3447,6 +3447,22 @@ static int univ8250_console_setup(struct console *co, char *options) return serial8250_console_setup(up, options); } +/* FIXME: this is broken on most other 8250 h/w */ +static unsigned int probe_baud(struct uart_port *port) +{ + unsigned char lcr, dll, dlm; + unsigned int quot; + + lcr = serial_port_in(port, UART_LCR); + serial_port_out(port, UART_LCR, lcr | UART_LCR_DLAB); + dll = serial_port_in(port, UART_DLL); + dlm = serial_port_in(port, UART_DLM); + serial_port_out(port, UART_LCR, lcr); + + quot = (dlm << 8) | dll; + return (port->uartclk / 16) / quot; +} + /** * univ8250_console_match - non-standard console matching * @co: registering console @@ -3455,13 +3471,18 @@ static int univ8250_console_setup(struct console *co, char *options) * @options: ptr to option string from console command line * * Only attempts to match console command lines of the form: - * console=uart<>,io|mmio|mmio32,, - * console=uart<>,,options + * console=uart[8250],io|mmio|mmio32,[,] + * console=uart[8250],0x[,] * This form is used to register an initial earlycon boot console and * replace it with the serial8250_console at 8250 driver init. * * Performs console setup for a match (as required by interface) * + * ** HACK ALERT ** + * If no are specified, then assume the h/w is already setup. + * This was the undocumented behavior of the original implementation so + * it is cast in stone forever. + * * Returns 0 if console matches; otherwise non-zero to use default matching */ static int univ8250_console_match(struct console *co, char *name, int idx, @@ -3475,12 +3496,16 @@ static int univ8250_console_match(struct console *co, char *name, int idx, if (strncmp(name, match, 4) != 0) return -ENODEV; + if (idx && idx != 8250) + return -ENODEV; + if (uart_parse_earlycon(options, &iotype, &addr, &options)) return -ENODEV; /* try to match the port specified on the command line */ for (i = 0; i < nr_uarts; i++) { struct uart_port *port = &serial8250_ports[i].port; + int baud, bits = 8, parity = 'n', flow = 'n'; if (port->iotype != iotype) continue; @@ -3490,8 +3515,15 @@ static int univ8250_console_match(struct console *co, char *name, int idx, if (iotype == UPIO_PORT && port->iobase != addr) continue; + /* link port to console */ co->index = i; - return univ8250_console_setup(co, options); + port->cons = co; + + if (options && *options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + else + baud = probe_baud(port); + return uart_set_options(port, port->cons, baud, parity, bits, flow); } return -ENODEV; diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c index e95ebfe..8e11968 100644 --- a/drivers/tty/serial/8250/8250_early.c +++ b/drivers/tty/serial/8250/8250_early.c @@ -105,21 +105,6 @@ static void __init early_serial8250_write(struct console *console, serial8250_early_out(port, UART_IER, ier); } -static unsigned int __init probe_baud(struct uart_port *port) -{ - unsigned char lcr, dll, dlm; - unsigned int quot; - - lcr = serial8250_early_in(port, UART_LCR); - serial8250_early_out(port, UART_LCR, lcr | UART_LCR_DLAB); - dll = serial8250_early_in(port, UART_DLL); - dlm = serial8250_early_in(port, UART_DLM); - serial8250_early_out(port, UART_LCR, lcr); - - quot = (dlm << 8) | dll; - return (port->uartclk / 16) / quot; -} - static void __init init_port(struct earlycon_device *device) { struct uart_port *port = &device->port; @@ -151,10 +136,6 @@ static int __init early_serial8250_setup(struct earlycon_device *device, struct uart_port *port = &device->port; unsigned int ier; - device->baud = probe_baud(&device->port); - snprintf(device->options, sizeof(device->options), "%u", - device->baud); - /* assume the device was initialized, only mask interrupts */ ier = serial8250_early_in(port, UART_IER); serial8250_early_out(port, UART_IER, ier & UART_IER_UUE); -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/