Commit 54a44d54 authored by Nikita Yushchenko's avatar Nikita Yushchenko Committed by Greg Kroah-Hartman

tty: serial: fsl_lpuart: fix del_timer_sync() vs timer routine deadlock

Problem found via lockdep:

- lpuart_set_termios() calls del_timer_sync(&sport->lpuart_timer) while
  holding sport->port.lock

- sport->lpuart_timer routine is lpuart_timer_func() that calls
  lpuart_copy_rx_to_tty() that acquires same lock.

To fix, move Rx DMA stopping out of lock, as it already is in other places
in the same file.

While at it, also make Rx DMA start/stop code to look the same is in
other places in the same file.
Signed-off-by: default avatarNikita Yushchenko <nikita.yoush@cogentembedded.com>
Tested-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 623ac1d4
...@@ -1407,6 +1407,18 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1407,6 +1407,18 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
/* ask the core to calculate the divisor */ /* ask the core to calculate the divisor */
baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 16); baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 16);
/*
* Need to update the Ring buffer length according to the selected
* baud rate and restart Rx DMA path.
*
* Since timer function acqures sport->port.lock, need to stop before
* acquring same lock because otherwise del_timer_sync() can deadlock.
*/
if (old && sport->lpuart_dma_rx_use) {
del_timer_sync(&sport->lpuart_timer);
lpuart_dma_rx_free(&sport->port);
}
spin_lock_irqsave(&sport->port.lock, flags); spin_lock_irqsave(&sport->port.lock, flags);
sport->port.read_status_mask = 0; sport->port.read_status_mask = 0;
...@@ -1456,22 +1468,11 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1456,22 +1468,11 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
/* restore control register */ /* restore control register */
writeb(old_cr2, sport->port.membase + UARTCR2); writeb(old_cr2, sport->port.membase + UARTCR2);
/* if (old && sport->lpuart_dma_rx_use) {
* If new baud rate is set, we will also need to update the Ring buffer if (!lpuart_start_rx_dma(sport))
* length according to the selected baud rate and restart Rx DMA path.
*/
if (old) {
if (sport->lpuart_dma_rx_use) {
del_timer_sync(&sport->lpuart_timer);
lpuart_dma_rx_free(&sport->port);
}
if (sport->dma_rx_chan && !lpuart_start_rx_dma(sport)) {
sport->lpuart_dma_rx_use = true;
rx_dma_timer_init(sport); rx_dma_timer_init(sport);
} else { else
sport->lpuart_dma_rx_use = false; sport->lpuart_dma_rx_use = false;
}
} }
spin_unlock_irqrestore(&sport->port.lock, flags); spin_unlock_irqrestore(&sport->port.lock, flags);
...@@ -2131,12 +2132,10 @@ static int lpuart_resume(struct device *dev) ...@@ -2131,12 +2132,10 @@ static int lpuart_resume(struct device *dev)
if (sport->lpuart_dma_rx_use) { if (sport->lpuart_dma_rx_use) {
if (sport->port.irq_wake) { if (sport->port.irq_wake) {
if (!lpuart_start_rx_dma(sport)) { if (!lpuart_start_rx_dma(sport))
sport->lpuart_dma_rx_use = true;
rx_dma_timer_init(sport); rx_dma_timer_init(sport);
} else { else
sport->lpuart_dma_rx_use = false; sport->lpuart_dma_rx_use = false;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment