diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-28 11:21:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-29 09:09:47 +0100 |
| commit | 4d6e5b641ceb5ba7b5eb7584126da815d233acb0 (patch) | |
| tree | a79a71199c1775562b3e9627078a18d58307eef8 | |
| parent | 0b2848e757aeaa8ea506d3cf8019755dafd3878a (diff) | |
| download | barebox-4d6e5b641ceb.tar.gz barebox-4d6e5b641ceb.tar.xz | |
serial: lpuart32: fix rx stall on FIFO overflow
When the rx FIFO overruns then no new characters are received, even
when the FIFO is read from and space becomes available again.
Acknowledge the overrun in this case to let the UART continue to work.
Link: https://lore.barebox.org/20240228102141.2724018-1-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/serial/serial_lpuart32.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/serial/serial_lpuart32.c b/drivers/serial/serial_lpuart32.c index 0f3e7c7a04..09d4b620be 100644 --- a/drivers/serial/serial_lpuart32.c +++ b/drivers/serial/serial_lpuart32.c @@ -44,6 +44,17 @@ static void lpuart32_disable(struct lpuart32 *lpuart32) writel(0, lpuart32->base + LPUART32_UARTCTRL); } +/* Test whether a character is in the RX buffer */ +static int lpuart32_serial_tstc(struct console_device *cdev) +{ + struct lpuart32 *lpuart32 = cdev_to_lpuart32(cdev); + + if (readl(lpuart32->base + LPUART32_UARTSTAT) & LPUART32_UARTSTAT_OR) + writel(LPUART32_UARTSTAT_OR, lpuart32->base + LPUART32_UARTSTAT); + + return readl(lpuart32->base + LPUART32_UARTSTAT) & LPUART32_UARTSTAT_RDRF; +} + static int lpuart32_serial_setbaudrate(struct console_device *cdev, int baudrate) { @@ -69,7 +80,7 @@ static int lpuart32_serial_getc(struct console_device *cdev) { struct lpuart32 *lpuart32 = cdev_to_lpuart32(cdev); - while (!(readl(lpuart32->base + LPUART32_UARTSTAT) & LPUART32_UARTSTAT_RDRF)); + while (!lpuart32_serial_tstc(cdev)); return readl(lpuart32->base + LPUART32_UARTDATA) & 0xff; } @@ -81,14 +92,6 @@ static void lpuart32_serial_putc(struct console_device *cdev, char c) lpuart32_putc(lpuart32->base, c); } -/* Test whether a character is in the RX buffer */ -static int lpuart32_serial_tstc(struct console_device *cdev) -{ - struct lpuart32 *lpuart32 = cdev_to_lpuart32(cdev); - - return readl(lpuart32->base + LPUART32_UARTSTAT) & LPUART32_UARTSTAT_RDRF; -} - static void lpuart32_serial_flush(struct console_device *cdev) { } |