]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: core: only stop transmit when HW fifo is empty
authorJonas Gorski <jonas.gorski@gmail.com>
Sun, 3 Mar 2024 15:08:07 +0000 (16:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:11:16 +0000 (15:11 +0200)
[ Upstream commit 7bfb915a597a301abb892f620fe5c283a9fdbd77 ]

If the circular buffer is empty, it just means we fit all characters to
send into the HW fifo, but not that the hardware finished transmitting
them.

So if we immediately call stop_tx() after that, this may abort any
pending characters in the HW fifo, and cause dropped characters on the
console.

Fix this by only stopping tx when the tx HW fifo is actually empty.

Fixes: 8275b48b2780 ("tty: serial: introduce transmit helpers")
Cc: stable@vger.kernel.org
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://lore.kernel.org/r/20240303150807.68117-1-jonas.gorski@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/linux/serial_core.h

index f43aca7f3b01eae3b3c52167eea4d806ebf4cd92..678409c47b885785c8b57954a89d9fef78b0af7d 100644 (file)
@@ -786,7 +786,8 @@ enum UART_TX_FLAGS {
        if (pending < WAKEUP_CHARS) {                                         \
                uart_write_wakeup(__port);                                    \
                                                                              \
-               if (!((flags) & UART_TX_NOSTOP) && pending == 0)              \
+               if (!((flags) & UART_TX_NOSTOP) && pending == 0 &&            \
+                   __port->ops->tx_empty(__port))                            \
                        __port->ops->stop_tx(__port);                         \
        }                                                                     \
                                                                              \