Skip to content

Commit a931237

Browse files
ij-intelgregkh
authored andcommitted
serial: 8250: Fall back to non-DMA Rx if IIR_RDI occurs
DW UART sometimes triggers IIR_RDI during DMA Rx when IIR_RX_TIMEOUT should have been triggered instead. Since IIR_RDI has higher priority than IIR_RX_TIMEOUT, this causes the Rx to hang into interrupt loop. The problem seems to occur at least with some combinations of small-sized transfers (I've reproduced the problem on Elkhart Lake PSE UARTs). If there's already an on-going Rx DMA and IIR_RDI triggers, fall graciously back to non-DMA Rx. That is, behave as if IIR_RX_TIMEOUT had occurred. 8250_omap already considers IIR_RDI similar to this change so its nothing unheard of. Fixes: 75df022 ("serial: 8250_dma: Fix RX handling") Cc: <[email protected]> Co-developed-by: Srikanth Thokala <[email protected]> Signed-off-by: Srikanth Thokala <[email protected]> Co-developed-by: Aman Kumar <[email protected]> Signed-off-by: Aman Kumar <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7b7dfe4 commit a931237

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/tty/serial/8250/8250_port.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,6 +1897,10 @@ EXPORT_SYMBOL_GPL(serial8250_modem_status);
18971897
static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)
18981898
{
18991899
switch (iir & 0x3f) {
1900+
case UART_IIR_RDI:
1901+
if (!up->dma->rx_running)
1902+
break;
1903+
fallthrough;
19001904
case UART_IIR_RX_TIMEOUT:
19011905
serial8250_rx_dma_flush(up);
19021906
fallthrough;

0 commit comments

Comments
 (0)