Commit 99e4fecd authored by Raviteja Narayanam's avatar Raviteja Narayanam Committed by Greg Kroah-Hartman

serial: uartps: Wait for tx_empty in console setup

[ Upstream commit 42e11948 ]

On some platforms, the log is corrupted while console is being
registered. It is observed that when set_termios is called, there
are still some bytes in the FIFO to be transmitted.

So, wait for tx_empty inside cdns_uart_console_setup before calling
set_termios.
Signed-off-by: default avatarRaviteja Narayanam <raviteja.narayanam@xilinx.com>
Reviewed-by: default avatarShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Link: https://lore.kernel.org/r/1586413563-29125-2-git-send-email-raviteja.narayanam@xilinx.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b860a828
...@@ -1236,6 +1236,7 @@ static int cdns_uart_console_setup(struct console *co, char *options) ...@@ -1236,6 +1236,7 @@ static int cdns_uart_console_setup(struct console *co, char *options)
int bits = 8; int bits = 8;
int parity = 'n'; int parity = 'n';
int flow = 'n'; int flow = 'n';
unsigned long time_out;
if (!port->membase) { if (!port->membase) {
pr_debug("console on " CDNS_UART_TTY_NAME "%i not present\n", pr_debug("console on " CDNS_UART_TTY_NAME "%i not present\n",
...@@ -1246,6 +1247,13 @@ static int cdns_uart_console_setup(struct console *co, char *options) ...@@ -1246,6 +1247,13 @@ static int cdns_uart_console_setup(struct console *co, char *options)
if (options) if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow); uart_parse_options(options, &baud, &parity, &bits, &flow);
/* Wait for tx_empty before setting up the console */
time_out = jiffies + usecs_to_jiffies(TX_TIMEOUT);
while (time_before(jiffies, time_out) &&
cdns_uart_tx_empty(port) != TIOCSER_TEMT)
cpu_relax();
return uart_set_options(port, co, baud, parity, bits, flow); return uart_set_options(port, co, baud, parity, bits, flow);
} }
......
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