Commit c8c6bfa3 authored by Russell King's avatar Russell King Committed by Linus Torvalds

serial: avoid stalling suspend if serial port won't drain

Some ports seem to be unable to drain their transmitters on shut down.  Such a
problem can occur if the port is programmed for hardware imposed flow control,
characters are in the FIFO but the CTS signal is inactive.

Normally, this isn't a problem because most places where we wait for the
transmitter to drain have a time-out.  However, there is no timeout in the
suspend path.

Give a port 30ms to drain; this is an arbitary value chosen to avoid long
delays if there are many such ports in the system, while giving a reasonable
chance for a single port to drain.  Should a port not drain within this
timeout, issue a warning.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d778a69
...@@ -1977,6 +1977,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) ...@@ -1977,6 +1977,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
if (state->info && state->info->flags & UIF_INITIALIZED) { if (state->info && state->info->flags & UIF_INITIALIZED) {
const struct uart_ops *ops = port->ops; const struct uart_ops *ops = port->ops;
int tries;
state->info->flags = (state->info->flags & ~UIF_INITIALIZED) state->info->flags = (state->info->flags & ~UIF_INITIALIZED)
| UIF_SUSPENDED; | UIF_SUSPENDED;
...@@ -1990,9 +1991,14 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) ...@@ -1990,9 +1991,14 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
/* /*
* Wait for the transmitter to empty. * Wait for the transmitter to empty.
*/ */
while (!ops->tx_empty(port)) { for (tries = 3; !ops->tx_empty(port) && tries; tries--) {
msleep(10); msleep(10);
} }
if (!tries)
printk(KERN_ERR "%s%s%s%d: Unable to drain transmitter\n",
port->dev ? port->dev->bus_id : "",
port->dev ? ": " : "",
drv->dev_name, port->line);
ops->shutdown(port); ops->shutdown(port);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment