* [PATCH v3] serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit
@ 2023-10-31 11:09 Ronald Wahl
2023-11-02 9:26 ` Vignesh Raghavendra
0 siblings, 1 reply; 2+ messages in thread
From: Ronald Wahl @ 2023-10-31 11:09 UTC (permalink / raw)
To: linux-kernel, linux-serial
Cc: Greg Kroah-Hartman, Vignesh Raghavendra, Ronald Wahl, stable
From: Ronald Wahl <ronald.wahl@raritan.com>
This fixes commit 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX
interrupt after DMA enable") which unfortunately set the
UART_HAS_RHR_IT_DIS bit in the UART_OMAP_IER2 register and never
cleared it.
Cc: stable@vger.kernel.org
Fixes: 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable")
Signed-off-by: Ronald Wahl <ronald.wahl@raritan.com>
---
V3: - add Cc: stable@vger.kernel.org
V2: - add Fixes: tag
- fix author
drivers/tty/serial/8250/8250_omap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index ca972fd37725..c7ab2963040b 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -914,7 +914,7 @@ static void __dma_rx_do_complete(struct uart_8250_port *p)
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg &= ~UART_OMAP_IER2_RHR_IT_DIS;
- serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
+ serial_out(p, UART_OMAP_IER2, reg);
}
dmaengine_tx_status(rxchan, cookie, &state);
@@ -1060,7 +1060,7 @@ static int omap_8250_rx_dma(struct uart_8250_port *p)
if (priv->habit & UART_HAS_RHR_IT_DIS) {
reg = serial_in(p, UART_OMAP_IER2);
reg |= UART_OMAP_IER2_RHR_IT_DIS;
- serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
+ serial_out(p, UART_OMAP_IER2, reg);
}
dma_async_issue_pending(dma->rxchan);
--
2.41.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v3] serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit
2023-10-31 11:09 [PATCH v3] serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit Ronald Wahl
@ 2023-11-02 9:26 ` Vignesh Raghavendra
0 siblings, 0 replies; 2+ messages in thread
From: Vignesh Raghavendra @ 2023-11-02 9:26 UTC (permalink / raw)
To: Ronald Wahl, linux-kernel, linux-serial
Cc: Greg Kroah-Hartman, Ronald Wahl, stable
On 31/10/23 16:39, Ronald Wahl wrote:
> From: Ronald Wahl <ronald.wahl@raritan.com>
>
> This fixes commit 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX
> interrupt after DMA enable") which unfortunately set the
> UART_HAS_RHR_IT_DIS bit in the UART_OMAP_IER2 register and never
> cleared it.
>
> Cc: stable@vger.kernel.org
> Fixes: 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable")
> Signed-off-by: Ronald Wahl <ronald.wahl@raritan.com>
> ---
> V3: - add Cc: stable@vger.kernel.org
>
> V2: - add Fixes: tag
> - fix author
>
> drivers/tty/serial/8250/8250_omap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
> index ca972fd37725..c7ab2963040b 100644
> --- a/drivers/tty/serial/8250/8250_omap.c
> +++ b/drivers/tty/serial/8250/8250_omap.c
> @@ -914,7 +914,7 @@ static void __dma_rx_do_complete(struct uart_8250_port *p)
> if (priv->habit & UART_HAS_RHR_IT_DIS) {
> reg = serial_in(p, UART_OMAP_IER2);
> reg &= ~UART_OMAP_IER2_RHR_IT_DIS;
> - serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
> + serial_out(p, UART_OMAP_IER2, reg);
> }
>
> dmaengine_tx_status(rxchan, cookie, &state);
> @@ -1060,7 +1060,7 @@ static int omap_8250_rx_dma(struct uart_8250_port *p)
> if (priv->habit & UART_HAS_RHR_IT_DIS) {
> reg = serial_in(p, UART_OMAP_IER2);
> reg |= UART_OMAP_IER2_RHR_IT_DIS;
> - serial_out(p, UART_OMAP_IER2, UART_OMAP_IER2_RHR_IT_DIS);
> + serial_out(p, UART_OMAP_IER2, reg);
> }
>
> dma_async_issue_pending(dma->rxchan);
Thanks for the fix!
Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>
> --
> 2.41.0
>
--
Regards
Vignesh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-02 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-31 11:09 [PATCH v3] serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit Ronald Wahl
2023-11-02 9:26 ` Vignesh Raghavendra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®