Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b68e63 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 775b7ffd7d6d5db320d99b0a485c51e04dfcf9f1 ]

While the .flush_buffer() callback clears sci_port.tx_dma_len since
commit 1cf4a7efdc71cab8 ("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.be


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c70bfc1b

drivers/tty/serial/sh-sci.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -1538,11 +1538,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)