From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932125AbcCWKj5 (ORCPT ); Wed, 23 Mar 2016 06:39:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:37435 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754658AbcCWKjk (ORCPT ); Wed, 23 Mar 2016 06:39:40 -0400 Subject: Re: [PATCH v4] tty: serial: meson: Implement earlycon support To: Arnd Bergmann , Greg Kroah-Hartman , linux-serial References: <1457263284-8819-1-git-send-email-afaerber@suse.de> Cc: linux-meson@googlegroups.com, Nicolas Saenz Julienne , Jonathan Corbet , Jiri Slaby , Carlo Caione , linux-doc , LKML , LAKML From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Organization: SUSE Linux GmbH Message-ID: <56F27268.4060902@suse.de> Date: Wed, 23 Mar 2016 11:39:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457263284-8819-1-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 06.03.2016 um 12:21 schrieb Andreas Färber: > Split off the bulk of the existing meson_serial_console_write() > implementation into meson_serial_port_write() for implementing > meson_serial_early_console_write(). > > Use "meson" as the earlycon driver name, courtesy of Nicolas. > > Signed-off-by: Nicolas Saenz Julienne > Acked-by: Carlo Caione > Signed-off-by: Andreas Färber > --- > v3 -> v4: > * Select SERIAL_EARLYCON (Arnd) Ping? Andreas > > v2 -> v3: > * Rename from "meson_serial" to just "meson" (Nicolas) > > v1 -> v2: > * Implement meson_serial_early_console_write() instead of reusing > meson_serial_console_write() (Peter) > > Documentation/kernel-parameters.txt | 6 ++++++ > drivers/tty/serial/Kconfig | 1 + > drivers/tty/serial/meson_uart.c | 42 ++++++++++++++++++++++++++++++------- > 3 files changed, 42 insertions(+), 7 deletions(-) > > diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt > index e0a21e4556a6..a7c1377fd80f 100644 > --- a/Documentation/kernel-parameters.txt > +++ b/Documentation/kernel-parameters.txt > @@ -1039,6 +1039,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. > the driver will use only 32-bit accessors to read/write > the device registers. > > + meson, > + Start an early, polled-mode console on a meson serial > + port at the specified address. The serial port must > + already be setup and configured. Options are not yet > + supported. > + > msm_serial, > Start an early, polled-mode console on an msm serial > port at the specified address. The serial port > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > index bdbe1c533c6a..ad7538e8a4e8 100644 > --- a/drivers/tty/serial/Kconfig > +++ b/drivers/tty/serial/Kconfig > @@ -213,6 +213,7 @@ config SERIAL_MESON_CONSOLE > bool "Support for console on meson" > depends on SERIAL_MESON=y > select SERIAL_CORE_CONSOLE > + select SERIAL_EARLYCON > help > Say Y here if you wish to use a Amlogic MesonX UART as the > system console (the system console is the device which > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 024445aa0521..6aea0f4a9165 100644 > --- a/drivers/tty/serial/meson_uart.c > +++ b/drivers/tty/serial/meson_uart.c > @@ -481,18 +481,13 @@ static void meson_console_putchar(struct uart_port *port, int ch) > writel(ch, port->membase + AML_UART_WFIFO); > } > > -static void meson_serial_console_write(struct console *co, const char *s, > - u_int count) > +static void meson_serial_port_write(struct uart_port *port, const char *s, > + u_int count) > { > - struct uart_port *port; > unsigned long flags; > int locked; > u32 val, tmp; > > - port = meson_ports[co->index]; > - if (!port) > - return; > - > local_irq_save(flags); > if (port->sysrq) { > locked = 0; > @@ -516,6 +511,18 @@ static void meson_serial_console_write(struct console *co, const char *s, > local_irq_restore(flags); > } > > +static void meson_serial_console_write(struct console *co, const char *s, > + u_int count) > +{ > + struct uart_port *port; > + > + port = meson_ports[co->index]; > + if (!port) > + return; > + > + meson_serial_port_write(port, s, count); > +} > + > static int meson_serial_console_setup(struct console *co, char *options) > { > struct uart_port *port; > @@ -554,6 +561,27 @@ static int __init meson_serial_console_init(void) > } > console_initcall(meson_serial_console_init); > > +static void meson_serial_early_console_write(struct console *co, > + const char *s, > + u_int count) > +{ > + struct earlycon_device *dev = co->data; > + > + meson_serial_port_write(&dev->port, s, count); > +} > + > +static int __init > +meson_serial_early_console_setup(struct earlycon_device *device, const char *opt) > +{ > + if (!device->port.membase) > + return -ENODEV; > + > + device->con->write = meson_serial_early_console_write; > + return 0; > +} > +OF_EARLYCON_DECLARE(meson, "amlogic,meson-uart", > + meson_serial_early_console_setup); > + > #define MESON_SERIAL_CONSOLE (&meson_serial_console) > #else > #define MESON_SERIAL_CONSOLE NULL > -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)