Commit 48c73b8e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

serial: sh-sci: Terminate TX DMA during buffer flushing

[ Upstream commit 775b7ffd ]

While the .flush_buffer() callback clears sci_port.tx_dma_len since
commit 1cf4a7ef ("serial: sh-sci: Fix race condition causing
garbage during shutdown"), it does not terminate a transmit DMA
operation that may be in progress.

Fix this by terminating any pending DMA operations, and resetting the
corresponding cookie.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarEugeniu Rosca <erosca@de.adit-jv.com>
Tested-by: default avatarEugeniu Rosca <erosca@de.adit-jv.com>

Link: https://lore.kernel.org/r/20190624123540.20629-3-geert+renesas@glider.beSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ca730bf0
...@@ -1633,11 +1633,18 @@ static void sci_free_dma(struct uart_port *port) ...@@ -1633,11 +1633,18 @@ static void sci_free_dma(struct uart_port *port)
static void sci_flush_buffer(struct uart_port *port) static void sci_flush_buffer(struct uart_port *port)
{ {
struct sci_port *s = to_sci_port(port);
/* /*
* In uart_flush_buffer(), the xmit circular buffer has just been * In uart_flush_buffer(), the xmit circular buffer has just been
* cleared, so we have to reset tx_dma_len accordingly. * cleared, so we have to reset tx_dma_len accordingly, and stop any
* pending transfers
*/ */
to_sci_port(port)->tx_dma_len = 0; s->tx_dma_len = 0;
if (s->chan_tx) {
dmaengine_terminate_async(s->chan_tx);
s->cookie_tx = -EINVAL;
}
} }
#else /* !CONFIG_SERIAL_SH_SCI_DMA */ #else /* !CONFIG_SERIAL_SH_SCI_DMA */
static inline void sci_request_dma(struct uart_port *port) static inline void sci_request_dma(struct uart_port *port)
......
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