[PATCH v3 2/2] serial: mxs-auart: wait for FIFO to flush before shutdown
Hector Palacios
hector.palacios at digi.com
Thu Oct 3 03:32:04 EDT 2013
The shutdown function was not waiting for the FIFO (which may be the
real 16 byte FIFO or the DMA buffer, if DMA is enabled) to flush
before disabling the AUART.
This lead to many bytes not being transferred (specially at low
baudrates), as they were still in the DMA buffer when the AUART was
shutdown.
This patch also adds the check for the BUSY flag on the tx_empty
callback.
Signed-off-by: Hector Palacios <hector.palacios at digi.com>
---
drivers/tty/serial/mxs-auart.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 9f046177..30edb91 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -757,9 +757,26 @@ static int mxs_auart_startup(struct uart_port *u)
return 0;
}
+static unsigned int mxs_auart_tx_empty(struct uart_port *u)
+{
+ unsigned long stat;
+
+ stat = readl(u->membase + AUART_STAT);
+ if ((stat & (AUART_STAT_BUSY | AUART_STAT_TXFE)) == AUART_STAT_TXFE)
+ return TIOCSER_TEMT;
+
+ return 0;
+}
+
static void mxs_auart_shutdown(struct uart_port *u)
{
struct mxs_auart_port *s = to_auart_port(u);
+ unsigned int to;
+
+ /* Wait for the FIFO to flush */
+ to = u->timeout;
+ while (!mxs_auart_tx_empty(u) && to--)
+ mdelay(1);
if (auart_dma_enabled(s))
mxs_auart_dma_exit(s);
@@ -774,14 +791,6 @@ static void mxs_auart_shutdown(struct uart_port *u)
clk_disable_unprepare(s->clk);
}
-static unsigned int mxs_auart_tx_empty(struct uart_port *u)
-{
- if (readl(u->membase + AUART_STAT) & AUART_STAT_TXFE)
- return TIOCSER_TEMT;
- else
- return 0;
-}
-
static void mxs_auart_start_tx(struct uart_port *u)
{
struct mxs_auart_port *s = to_auart_port(u);
--
1.8.4
More information about the linux-arm-kernel
mailing list