diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-02-24 15:57:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-02-27 16:50:00 +0900 |
| commit | 973e5d525d39be6f9f6c38d37aacf03efda02e60 (patch) | |
| tree | 618715c8df3e2d87a9b9a5d43839813e019f108e /drivers/serial/sh-sci.c | |
| parent | a73090ffaf0f6853880d9ac3fff7e5d88215131a (diff) | |
| download | linux-973e5d525d39be6f9f6c38d37aacf03efda02e60.tar.gz linux-973e5d525d39be6f9f6c38d37aacf03efda02e60.tar.bz2 linux-973e5d525d39be6f9f6c38d37aacf03efda02e60.zip | |
serial: sh-sci: console drainage
Modify the serial console code to wait for the transmit FIFO,
make sure all bits have been put on the wire before returning.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
| -rw-r--r-- | drivers/serial/sh-sci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 557b54ab2f25..d3ccce0bfd44 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -139,7 +139,7 @@ static void sci_poll_put_char(struct uart_port *port, unsigned char c) } while (!(status & SCxSR_TDxE(port))); sci_in(port, SCxSR); /* Dummy read */ - sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port)); + sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port)); sci_out(port, SCxTDR, c); } #endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE */ @@ -1095,6 +1095,7 @@ static void serial_console_write(struct console *co, const char *s, unsigned count) { struct uart_port *port = &serial_console_port->port; + unsigned short bits; int i; for (i = 0; i < count; i++) { @@ -1103,6 +1104,11 @@ static void serial_console_write(struct console *co, const char *s, sci_poll_put_char(port, *s++); } + + /* wait until fifo is empty and last bit has been transmitted */ + bits = SCxSR_TDxE(port) | SCxSR_TEND(port); + while ((sci_in(port, SCxSR) & bits) != bits) + cpu_relax(); } static int __init serial_console_setup(struct console *co, char *options) |