This is a note to let you know that I've just added the patch titled
serial: 8250: 8250_omap: Do not start RX DMA on THRI interrupt
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
serial-8250-8250_omap-do-not-start-rx-dma-on-thri-interrupt.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c6bb057418876cdfdd29a6f7b8cef54539ee8811 Mon Sep 17 00:00:00 2001
From: Ronald Wahl <ronald.wahl@xxxxxxxxxxx>
Date: Wed, 1 Nov 2023 18:14:31 +0100
Subject: serial: 8250: 8250_omap: Do not start RX DMA on THRI interrupt
From: Ronald Wahl <ronald.wahl@xxxxxxxxxxx>
commit c6bb057418876cdfdd29a6f7b8cef54539ee8811 upstream.
Starting RX DMA on THRI interrupt is too early because TX may not have
finished yet.
This change is inspired by commit 90b8596ac460 ("serial: 8250: Prevent
starting up DMA Rx on THRI interrupt") and fixes DMA issues I had with
an AM62 SoC that is using the 8250 OMAP variant.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: c26389f998a8 ("serial: 8250: 8250_omap: Add DMA support for UARTs on K3 SoCs")
Signed-off-by: Ronald Wahl <ronald.wahl@xxxxxxxxxxx>
Reviewed-by: Vignesh Raghavendra <vigneshr@xxxxxx>
Link: https://lore.kernel.org/r/20231101171431.16495-1-rwahl@xxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/tty/serial/8250/8250_omap.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1186,10 +1186,12 @@ static int omap_8250_dma_handle_irq(stru
status = serial_port_in(port, UART_LSR);
- if (priv->habit & UART_HAS_EFR2)
- am654_8250_handle_rx_dma(up, iir, status);
- else
- status = omap_8250_handle_rx_dma(up, iir, status);
+ if ((iir & 0x3f) != UART_IIR_THRI) {
+ if (priv->habit & UART_HAS_EFR2)
+ am654_8250_handle_rx_dma(up, iir, status);
+ else
+ status = omap_8250_handle_rx_dma(up, iir, status);
+ }
serial8250_modem_status(up);
if (status & UART_LSR_THRE && up->dma->tx_err) {
Patches currently in stable-queue which might be from ronald.wahl@xxxxxxxxxxx are
queue-6.1/serial-8250_omap-add-earlycon-support-for-the-am654-uart-controller.patch
queue-6.1/serial-8250-8250_omap-clear-uart_has_rhr_it_dis-bit.patch
queue-6.1/serial-8250-8250_omap-do-not-start-rx-dma-on-thri-interrupt.patch
