Switching baud rate might cause bogus data to appear in HW
FIFO. Add code to do a HW FIFO flush to .flush_buffer callback to
avoid that.

Signed-off-by: Fugang Duan <fugang.d...@nxp.com>
Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
Cc: Stefan Agner <ste...@agner.ch>
Cc: Chris Healy <cphe...@gmail.com>
Cc: Cory Tusar <cory.tu...@zii.aero>
Cc: Lucas Stach <l.st...@pengutronix.de>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Jiri Slaby <jsl...@suse.com>
Cc: linux-...@nxp.com
Cc: linux-ser...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/tty/serial/fsl_lpuart.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 317bbc1dd2b4..12ddca608eba 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -518,9 +518,16 @@ static int lpuart_dma_tx_request(struct uart_port *port)
        return 0;
 }
 
+static bool lpuart_is_32(struct lpuart_port *sport)
+{
+       return sport->port.iotype == UPIO_MEM32 ||
+              sport->port.iotype ==  UPIO_MEM32BE;
+}
+
 static void lpuart_flush_buffer(struct uart_port *port)
 {
        struct lpuart_port *sport = container_of(port, struct lpuart_port, 
port);
+       u32 val;
 
        if (sport->lpuart_dma_tx_use) {
                if (sport->dma_tx_in_progress) {
@@ -530,6 +537,16 @@ static void lpuart_flush_buffer(struct uart_port *port)
                }
                dmaengine_terminate_all(sport->dma_tx_chan);
        }
+
+       if (lpuart_is_32(sport)) {
+               val = lpuart32_read(&sport->port, UARTFIFO);
+               val |= UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH;
+               lpuart32_write(&sport->port, val, UARTFIFO);
+       } else {
+               val = readb(sport->port.membase + UARTPFIFO);
+               val |= UARTCFIFO_TXFLUSH | UARTCFIFO_RXFLUSH;
+               writeb(val, sport->port.membase + UARTCFIFO);
+       }
 }
 
 #if defined(CONFIG_CONSOLE_POLL)
@@ -754,12 +771,6 @@ static unsigned int lpuart32_tx_empty(struct uart_port 
*port)
        return 0;
 }
 
-static bool lpuart_is_32(struct lpuart_port *sport)
-{
-       return sport->port.iotype == UPIO_MEM32 ||
-              sport->port.iotype ==  UPIO_MEM32BE;
-}
-
 static irqreturn_t lpuart_txint(int irq, void *dev_id)
 {
        struct lpuart_port *sport = dev_id;
-- 
2.21.0

Reply via email to