Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit ea55c65

Browse files
KanjiMonstergregkh
authored andcommitted
serial: bcm63xx-uart: fix tx after conversion to uart_port_tx_limited()
When bcm63xx-uart was converted to uart_port_tx_limited(), it implicitly added a call to stop_tx(). This causes garbage to be put out on the serial console. To fix this, pass UART_TX_NOSTOP in flags, and manually call stop_tx() ourselves analogue to how a similar issue was fixed in commit 7be50f2 ("serial: mxs-auart: fix tx"). Fixes: d11cc8c ("tty: serial: use uart_port_tx_limited()") Cc: stable@vger.kernel.org Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Doug Brown <doug@schmorgal.com> Link: https://lore.kernel.org/r/20240606195632.173255-4-doug@schmorgal.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9bb43b9 commit ea55c65

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/tty/serial/bcm63xx_uart.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ static void bcm_uart_do_tx(struct uart_port *port)
308308

309309
val = bcm_uart_readl(port, UART_MCTL_REG);
310310
val = (val & UART_MCTL_TXFIFOFILL_MASK) >> UART_MCTL_TXFIFOFILL_SHIFT;
311-
312-
pending = uart_port_tx_limited(port, ch, port->fifosize - val,
311+
pending = uart_port_tx_limited_flags(port, ch, UART_TX_NOSTOP,
312+
port->fifosize - val,
313313
true,
314314
bcm_uart_writel(port, ch, UART_FIFO_REG),
315315
({}));
@@ -320,6 +320,9 @@ static void bcm_uart_do_tx(struct uart_port *port)
320320
val = bcm_uart_readl(port, UART_IR_REG);
321321
val &= ~UART_TX_INT_MASK;
322322
bcm_uart_writel(port, val, UART_IR_REG);
323+
324+
if (uart_tx_stopped(port))
325+
bcm_uart_stop_tx(port);
323326
}
324327

325328
/*

0 commit comments

Comments
 (0)