| Message ID | 20241227224523.28131-3-john.ogness@linutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | convert 8250 to nbcon | expand |
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 3a946ebe9139..aeacf9d452e4 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -2083,7 +2083,14 @@ static bool wait_for_lsr(struct uart_8250_port *up, int bits) { unsigned int status, tmout = 10000; - /* Wait up to 10ms for the character(s) to be sent. */ + /* + * Wait for a character to be sent. Fallback to a safe default + * timeout value if @frame_time is not available. + */ + + if (up->port.frame_time) + tmout = up->port.frame_time * 2 / NSEC_PER_USEC; + for (;;) { status = serial_lsr_in(up);
Rather than using a hard-coded per-character Tx-timeout of 10ms, use the frame rate to determine a timeout value. The value is doubled to ensure that a timeout is only hit during unexpected circumstances. Since the frame rate may not be available during early printing, the previous 10ms value is kept as a fallback. Signed-off-by: John Ogness <john.ogness@linutronix.de> --- drivers/tty/serial/8250/8250_port.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)