Skip to content

Commit 0e5ec41

Browse files
Russell Enderbygregkh
authored andcommitted
serial: bcm63xx: fix timing issue.
Issue where unprintable characters can occur or output is cut off over the serial uart / linux console depending on timing. Problem occurs when changing the serial baud rate when setting up the new console.The bcm63xx driver does a disable and flush of the uart tx fifo while there is data still in the tx fifo. If the tx fifo still has data it is trying to send out, we need to wait until it is empty before disabling and flushing the uart. When we now go to change the uart parameters including speed we check if there is data currently in the tx fifo.If there is was mdelay(10) and check again.If it tries 3 times and still has data in it we just continue and sacrifice the tx fifo buffer. A cleaner and more preferred approach would be to remove : - spin_lock_irqsave() - bcm_uart_disable() - bcm_uart_flush() However it is not clear if the author put those in to fix another underlying issue.As a result this solution is a safer approach. Output before the fix: [0.306000] 14e00520.serial: ttyS0 at MMIO 0x14e00520 (irq = 9, base_baud = 1687500) is a° 0.315000] console[ttyS0] enabled Output verified after the fix: [0.315000] 14e00520.serial: ttyS0 at MMIO 0x14e00520 (irq = 9, base_baud = 1687500) is a bcm63xx_uart [0.334000] console[ttyS0] enabled Signed-off-by: Russell Enderby <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 104583b commit 0e5ec41

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/tty/serial/bcm63xx_uart.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,14 @@ static void bcm_uart_set_termios(struct uart_port *port,
507507
{
508508
unsigned int ctl, baud, quot, ier;
509509
unsigned long flags;
510+
int tries;
510511

511512
spin_lock_irqsave(&port->lock, flags);
512513

514+
/* Drain the hot tub fully before we power it off for the winter. */
515+
for (tries = 3; !bcm_uart_tx_empty(port) && tries; tries--)
516+
mdelay(10);
517+
513518
/* disable uart while changing speed */
514519
bcm_uart_disable(port);
515520
bcm_uart_flush(port);

0 commit comments

Comments
 (0)