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

Commit 61026eed authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting 



commit 754f68044c7dd6c52534ba3e0f664830285c4b15 upstream.

DMA complete & stop paths did not correctly account Tx'ed characters
into icount.tx. Using uart_xmit_advance() fixes the problem.

Fixes: e9ea096d ("serial: tegra: add serial driver")
Cc: <stable@vger.kernel.org> # serial: Create uart_xmit_advance()
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220901143934.8850-3-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b5fa3ab

drivers/tty/serial/serial-tegra.c

+2 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void tegra_uart_tx_dma_complete(void *args) 
	count = tup->tx_bytes_requested - state.residue;

	async_tx_ack(tup->tx_dma_desc);

	spin_lock_irqsave(&tup->uport.lock, flags);

	xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);

	uart_xmit_advance(&tup->uport, count);

	tup->tx_in_progress = 0;

	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)

		uart_write_wakeup(&tup->uport);
@@ -482,7 +482,6 @@ static unsigned int tegra_uart_tx_empty(struct uart_port *u) 
static void tegra_uart_stop_tx(struct uart_port *u)

{

	struct tegra_uart_port *tup = to_tegra_uport(u);

	struct circ_buf *xmit = &tup->uport.state->xmit;

	struct dma_tx_state state;

	unsigned int count;
@@ -493,7 +492,7 @@ static void tegra_uart_stop_tx(struct uart_port *u) 
	dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state);

	count = tup->tx_bytes_requested - state.residue;

	async_tx_ack(tup->tx_dma_desc);

	xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);

	uart_xmit_advance(&tup->uport, count);

	tup->tx_in_progress = 0;

}