diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2015-11-18 14:41:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 19:59:48 -0800 |
| commit | f1dd05c82985f9c476969598fd97cc680f18e86b (patch) | |
| tree | 0b968c0fb50b6bb29a2112c8ab1768b641a82aa6 /drivers | |
| parent | 2561f068d91bbb1bd132b439c9023120c0b28cf4 (diff) | |
| download | linux-stable-f1dd05c82985f9c476969598fd97cc680f18e86b.tar.gz linux-stable-f1dd05c82985f9c476969598fd97cc680f18e86b.tar.bz2 linux-stable-f1dd05c82985f9c476969598fd97cc680f18e86b.zip | |
ARM: meson: serial: ensure tx irq on if more work to do
The tx_stop() call turns the interrupt off, but the tx_start() does not
check if the interrupt is enabled. Switch it back on if there is more
work to do.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/meson_uart.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 12436cceebb7..6c365267e26a 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -144,6 +144,7 @@ static void meson_uart_start_tx(struct uart_port *port) { struct circ_buf *xmit = &port->state->xmit; unsigned int ch; + u32 val; if (uart_tx_stopped(port)) { meson_uart_stop_tx(port); @@ -167,6 +168,12 @@ static void meson_uart_start_tx(struct uart_port *port) port->icount.tx++; } + if (!uart_circ_empty(xmit)) { + val = readl(port->membase + AML_UART_CONTROL); + val |= AML_UART_TX_INT_EN; + writel(val, port->membase + AML_UART_CONTROL); + } + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(port); } |