Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: meson: serial: ensure console port uart enabled

Browse source 
Ensure the UART's transmitter is enabled when meson_console_putchar is
called. If not, then the console output is corrupt (the hardware seems
to try and send /something/ even if the TX is disabled).

This fixes corrupt console output on events such as trying to reboot the
system since the console tx may be called after drivers shutdown method has
been called.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reported-by: Edward Cragg <edward.cragg@codethink.co.uk>
Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Dooks 2015-11-18 14:41:14 +00:00 committed by Greg Kroah-Hartman
parent 8867973901
commit 41788f0549
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/tty/serial/meson_uart.c
View file

@ -472,6 +472,7 @@ static void meson_serial_console_write(struct console *co, const char *s,
struct uart_port *port;
unsigned long flags;
int locked;
u32 val;
port = meson_ports[co->index];
if (!port)
@ -487,6 +488,9 @@ static void meson_serial_console_write(struct console *co, const char *s,
locked = 1;
}
val = readl(port->membase + AML_UART_CONTROL);
writel(val | AML_UART_TX_EN, port->membase + AML_UART_CONTROL);
uart_console_write(port, s, count, meson_console_putchar);
if (locked)