Commit c7d44a02 authored by Doug Anderson's avatar Doug Anderson Committed by Greg Kroah-Hartman

serial_core: Commonalize crlf when working w/ a non open console port

In (efe2f29e 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 (d358788f [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: default avatarDoug Anderson <dianders@chromium.org>
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f1e126b
...@@ -1926,13 +1926,8 @@ static void serial8250_put_poll_char(struct uart_port *port, ...@@ -1926,13 +1926,8 @@ static void serial8250_put_poll_char(struct uart_port *port,
wait_for_xmitr(up, BOTH_EMPTY); wait_for_xmitr(up, BOTH_EMPTY);
/* /*
* Send the character out. * Send the character out.
* If a LF, also do CR...
*/ */
serial_port_out(port, UART_TX, c); serial_port_out(port, UART_TX, c);
if (c == 10) {
wait_for_xmitr(up, BOTH_EMPTY);
serial_port_out(port, UART_TX, 13);
}
/* /*
* Finally, wait for transmitter to become empty * Finally, wait for transmitter to become empty
......
...@@ -1590,13 +1590,8 @@ static void pch_uart_put_poll_char(struct uart_port *port, ...@@ -1590,13 +1590,8 @@ static void pch_uart_put_poll_char(struct uart_port *port,
wait_for_xmitr(priv, UART_LSR_THRE); wait_for_xmitr(priv, UART_LSR_THRE);
/* /*
* Send the character out. * Send the character out.
* If a LF, also do CR...
*/ */
iowrite8(c, priv->membase + PCH_UART_THR); iowrite8(c, priv->membase + PCH_UART_THR);
if (c == 10) {
wait_for_xmitr(priv, UART_LSR_THRE);
iowrite8(13, priv->membase + PCH_UART_THR);
}
/* /*
* Finally, wait for transmitter to become empty * Finally, wait for transmitter to become empty
......
...@@ -711,13 +711,8 @@ static void serial_pxa_put_poll_char(struct uart_port *port, ...@@ -711,13 +711,8 @@ static void serial_pxa_put_poll_char(struct uart_port *port,
wait_for_xmitr(up); wait_for_xmitr(up);
/* /*
* Send the character out. * Send the character out.
* If a LF, also do CR...
*/ */
serial_out(up, UART_TX, c); serial_out(up, UART_TX, c);
if (c == 10) {
wait_for_xmitr(up);
serial_out(up, UART_TX, 13);
}
/* /*
* Finally, wait for transmitter to become empty * Finally, wait for transmitter to become empty
......
...@@ -2236,6 +2236,9 @@ static void uart_poll_put_char(struct tty_driver *driver, int line, char ch) ...@@ -2236,6 +2236,9 @@ static void uart_poll_put_char(struct tty_driver *driver, int line, char ch)
return; return;
port = state->uart_port; port = state->uart_port;
if (ch == '\n')
port->ops->poll_put_char(port, '\r');
port->ops->poll_put_char(port, ch); port->ops->poll_put_char(port, ch);
} }
#endif #endif
......
...@@ -535,13 +535,8 @@ static void serial_txx9_put_poll_char(struct uart_port *port, unsigned char c) ...@@ -535,13 +535,8 @@ static void serial_txx9_put_poll_char(struct uart_port *port, unsigned char c)
wait_for_xmitr(up); wait_for_xmitr(up);
/* /*
* Send the character out. * Send the character out.
* If a LF, also do CR...
*/ */
sio_out(up, TXX9_SITFIFO, c); sio_out(up, TXX9_SITFIFO, c);
if (c == 10) {
wait_for_xmitr(up);
sio_out(up, TXX9_SITFIFO, 13);
}
/* /*
* Finally, wait for transmitter to become empty * Finally, wait for transmitter to become empty
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment