serial: 8250: Flush DMA Rx on RLSI
PATCH 1/1 serial: 8250: Flush DMA Rx on RLSI
commit 1980860e0c8299316cddaf0992dd9e1258ec9d88 upstream.
Returning true from handle_rx_dma() without flushing DMA first creates a data ordering hazard. If DMA Rx has handled any character at the point when RLSI occurs, the non-DMA path handles any pending characters jumping them ahead of those characters that are pending under DMA.
--- drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/tty/serial/8250/8250_port.c +1 -2
@@ -1824,10 +1824,9 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)if (!up->dma->rx_running)break ; fallthrough; +case UART_IIR_RLSI :case UART_IIR_RX_TIMEOUT :serial8250_rx_dma_flush (up); -/* fall-through */ -case UART_IIR_RLSI :return true; }return up->dma->rx_dma (up);
Signature · 1 line
2.30.2
Quoted 13 lines · Ilpo Järvinen
commit
1980860e0c8299316cddaf0992dd9e1258ec9d88upstream.Returning true from
handle_rx_dma()without flushing DMA first creates a data ordering hazard. If DMA Rx has handled any character at the point when RLSI occurs, the non-DMA path handles any pending characters jumping them ahead of those characters that are pending under DMA.Fixes 75df022b5f89 ("serial: 8250_dma: Fix RX handling")Cc <[email protected]>Signed-off-by Ilpo Järvinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 3 lines
--- drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Applied to 5.4.y only. Fails to apply to 4.9.y, 4.14.y, or 4.19.y :(
Ilpo Järvinen
Reviewed-by Andy Shevchenkocommit 1980860e0c8299316cddaf0992dd9e1258ec9d88 upstream.
Returning true from handle_rx_dma() without flushing DMA first creates a data ordering hazard. If DMA Rx has handled any character at the point when RLSI occurs, the non-DMA path handles any pending characters jumping them ahead of those characters that are pending under DMA.
--- drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/tty/serial/8250/8250_port.c +1 -2
@@ -1802,10 +1802,9 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)if (!up->dma->rx_running)break ;/* fall-through */ +case UART_IIR_RLSI :case UART_IIR_RX_TIMEOUT :serial8250_rx_dma_flush (up); -/* fall-through */ -case UART_IIR_RLSI :return true; }return up->dma->rx_dma (up);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerQuoted 35 lines · Ilpo Järvinen
commit
1980860e0c8299316cddaf0992dd9e1258ec9d88upstream.Returning true from
handle_rx_dma()without flushing DMA first creates a data ordering hazard. If DMA Rx has handled any character at the point when RLSI occurs, the non-DMA path handles any pending characters jumping them ahead of those characters that are pending under DMA.Fixes 75df022b5f89 ("serial: 8250_dma: Fix RX handling")Cc <[email protected]>Signed-off-by Ilpo Järvinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/tty/serial/8250/8250_port.c +1
-2@@ -1802,10 +1802,9 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)if (!up->dma->rx_running)break ;/* fall-through */ +case UART_IIR_RLSI :case UART_IIR_RX_TIMEOUT :serial8250_rx_dma_flush (up); -/* fall-through */ -case UART_IIR_RLSI :return true; }return up->dma->rx_dma (up);Signature · 1 line
2.30.2
Now queued up, thanks.
greg k-h