]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: core: Fix runtime PM handling for pending tx
authorTony Lindgren <tony@atomide.com>
Mon, 23 Oct 2023 07:48:54 +0000 (10:48 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Oct 2023 09:35:29 +0000 (11:35 +0200)
Richard reported that a serial port may end up sometimes with tx data
pending in the buffer for long periods of time.

Turns out we bail out early on any errors from pm_runtime_get(),
including -EINPROGRESS. To fix the issue, we need to ignore -EINPROGRESS
as we only care about the runtime PM usage count at this point. We check
for an active runtime PM state later on for tx.

Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM")
Cc: stable <stable@kernel.org>
Reported-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: Mikko Rapeli <mikko.rapeli@linaro.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Randy MacLeod <randy.macleod@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Link: https://lore.kernel.org/r/20231023074856.61896-1-tony@atomide.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/serial_core.c

index b106eb3943d073107ada9652c1f53fda46b9ea04..f1348a5095527e876b17a7463d3d8cee0321291f 100644 (file)
@@ -146,7 +146,7 @@ static void __uart_start(struct uart_state *state)
 
        /* Increment the runtime PM usage count for the active check below */
        err = pm_runtime_get(&port_dev->dev);
-       if (err < 0) {
+       if (err < 0 && err != -EINPROGRESS) {
                pm_runtime_put_noidle(&port_dev->dev);
                return;
        }