FAILED: patch "[PATCH] serial: qcom_geni: Fix RX DMA stall when SE_DMA_RX_LEN_IN is" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x b93062b6d8a1b2d9bad235cac25558a909819026
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026062523-sulfite-banking-76d6@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b93062b6d8a1b2d9bad235cac25558a909819026 Mon Sep 17 00:00:00 2001
From: Viken Dadhaniya <[email protected]>
Date: Thu, 28 May 2026 22:48:07 +0530
Subject: [PATCH] serial: qcom_geni: Fix RX DMA stall when SE_DMA_RX_LEN_IN is
zero
In qcom_geni_serial_handle_rx_dma(), geni_se_rx_dma_unprep() clears port->rx_dma_addr before SE_DMA_RX_LEN_IN is read. If the register is zero, for example when the RX stale counter fires on an idle line, the handler returns without calling geni_se_rx_dma_prep().
The next RX DMA interrupt then hits the !port->rx_dma_addr guard and returns immediately, so the RX DMA buffer is never rearmed and later input is lost.
Keep the handler on the rearm path when rx_in is zero. Warn about the unexpected zero-length DMA completion, skip received-data handling, and always call geni_se_rx_dma_prep().
drivers/tty/serial/qcom_geni_serial.c +3 -6
@@ -905,12 +905,9 @@ static void qcom_geni_serial_handle_rx_dma(struct uart_port *uport, bool drop) port->rx_dma_addr =0 ; rx_in =readl (uport->membase +SE_DMA_RX_LEN_IN ); -if (!rx_in) { -dev_warn (uport->dev,"serial engine reports 0 RX bytes in!\n" ); -return ; - } - -if (!drop) +if (!rx_in) +dev_warn_ratelimited (uport->dev,"serial engine reports 0 RX bytes in!\n" ); +else if (!drop)handle_rx_uart (uport, rx_in); ret = geni_se_rx_dma_prep(&port->se, port->rx_buf,
Sasha Levin
maintainerPATCH 1/1 serial: qcom_geni: Fix RX DMA stall when SE_DMA_RX_LEN_IN is zero
From: Viken Dadhaniya <[email protected]>
[ Upstream commit b93062b6d8a1b2d9bad235cac25558a909819026 ]
In qcom_geni_serial_handle_rx_dma(), geni_se_rx_dma_unprep() clears port->rx_dma_addr before SE_DMA_RX_LEN_IN is read. If the register is zero, for example when the RX stale counter fires on an idle line, the handler returns without calling geni_se_rx_dma_prep().
The next RX DMA interrupt then hits the !port->rx_dma_addr guard and returns immediately, so the RX DMA buffer is never rearmed and later input is lost.
Keep the handler on the rearm path when rx_in is zero. Warn about the unexpected zero-length DMA completion, skip received-data handling, and always call geni_se_rx_dma_prep().
--- drivers/tty/serial/qcom_geni_serial.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +3 -6
@@ -838,12 +838,9 @@ static void qcom_geni_serial_handle_rx_dma(struct uart_port *uport, bool drop) port->rx_dma_addr =0 ; rx_in =readl (uport->membase +SE_DMA_RX_LEN_IN ); -if (!rx_in) { -dev_warn (uport->dev,"serial engine reports 0 RX bytes in!\n" ); -return ; - } - -if (!drop) +if (!rx_in) +dev_warn_ratelimited (uport->dev,"serial engine reports 0 RX bytes in!\n" ); +else if (!drop)handle_rx_uart (uport, rx_in, drop); ret = geni_se_rx_dma_prep(&port->se, port->rx_buf,
Signature · 1 line
2.53.0