diff options
author | Doug Anderson <dianders@chromium.org> | 2014-04-21 13:06:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 19:13:01 -0400 |
commit | c7d44a02ac606c2bebf90751deebec2321379d6d (patch) | |
tree | 3d16a26ddadb9f1f2b3a52ccffa7691925ce552a /drivers/tty/serial/serial_txx9.c | |
parent | 0f1e126b8c50a479a9047654f8ceda5ccfaa0d8a (diff) |
serial_core: Commonalize crlf when working w/ a non open console port
In (efe2f29 kgdboc,kdb: Allow kdb to work on a non open console port)
support was added to directly use the "write_char" functions when
doing kdb over a non-open console port. This is great, but it ends up
bypassing the normal code in uart_console_write() that adds a carriage
return before any newlines.
There appears to have been a trend to add this support directly in
some console driver's poll_put_char() functions. This had a few side
effects, including:
- In this case we were doing LFCR, not CRLF. This was fixed in
uart_console_write() back in (d358788 [SERIAL] kernel console should
send CRLF not LFCR)
- Not all serial drivers had the LFCR code in their poll_put_char()
functions. In my case I was running serial/samsung.c which lacked
it.
I've moved the handling to uart_poll_put_char() to fix the above
problems. Now when I use kdb (and don't point console= to the same
UART) I no longer get:
[0]kdb>
[0]kdb>
[0]kdb>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial_txx9.c')
-rw-r--r-- | drivers/tty/serial/serial_txx9.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c index 90a080b1f9ee..60f49b9d7e39 100644 --- a/drivers/tty/serial/serial_txx9.c +++ b/drivers/tty/serial/serial_txx9.c | |||
@@ -535,13 +535,8 @@ static void serial_txx9_put_poll_char(struct uart_port *port, unsigned char c) | |||
535 | wait_for_xmitr(up); | 535 | wait_for_xmitr(up); |
536 | /* | 536 | /* |
537 | * Send the character out. | 537 | * Send the character out. |
538 | * If a LF, also do CR... | ||
539 | */ | 538 | */ |
540 | sio_out(up, TXX9_SITFIFO, c); | 539 | sio_out(up, TXX9_SITFIFO, c); |
541 | if (c == 10) { | ||
542 | wait_for_xmitr(up); | ||
543 | sio_out(up, TXX9_SITFIFO, 13); | ||
544 | } | ||
545 | 540 | ||
546 | /* | 541 | /* |
547 | * Finally, wait for transmitter to become empty | 542 | * Finally, wait for transmitter to become empty |