Skip to content
Permalink
Browse files

tty/serial: atmel: fix TX path in atmel_console_write()

commit 497e1e1 upstream.

A side effect of 89d8232 ("tty/serial: atmel_serial: BUG: stop DMA
from transmitting in stop_tx") is that the console can be called with
TX path disabled. Then the system would hang trying to push charecters
out in atmel_console_putchar().

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Fixes: 89d8232 ("tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information...
noglitch authored and gregkh committed Mar 20, 2017
1 parent 74b8fc0 commit 0a1757cfa5ba3b46f6ee7a74ddb7a5c0bd5d7c2f
Showing with 3 additions and 0 deletions.
  1. +3 −0 drivers/tty/serial/atmel_serial.c
@@ -2504,6 +2504,9 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
pdc_tx = atmel_uart_readl(port, ATMEL_PDC_PTSR) & ATMEL_PDC_TXTEN;
atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS);

/* Make sure that tx path is actually able to send characters */
atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);

uart_console_write(port, s, count, atmel_console_putchar);

/*

0 comments on commit 0a1757c

Please sign in to comment.
You can’t perform that action at this time.