lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

serial: bfin_uart: Don't switch baud rate untill the transfer buffer is empty.

Browse Source 
set_termios may be invoked before the former data transfer is completed.
Block until the tranfer is done.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sonic Zhang
2012-11-19 14:40:56 +08:00
committed by Greg Kroah-Hartman
parent 159a8e92fd
commit 1cd3f2d2c9
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/tty/serial/bfin_uart.c
View File

@@ -799,6 +799,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
unsigned long flags; unsigned long flags;
unsigned int baud, quot; unsigned int baud, quot;
unsigned int ier, lcr = 0; unsigned int ier, lcr = 0;
unsigned long timeout;
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS8: case CS8:
@@ -868,6 +869,14 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15); UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);
/* Wait till the transfer buffer is empty */
timeout = jiffies + msecs_to_jiffies(10);
while (UART_GET_GCTL(uart) & UCEN && !(UART_GET_LSR(uart) & TEMT))
if (time_after(jiffies, timeout)) {
dev_warn(port->dev, "timeout waiting for TX buffer empty\n");
break;
}
/* Disable UART */ /* Disable UART */
ier = UART_GET_IER(uart); ier = UART_GET_IER(uart);
UART_PUT_GCTL(uart, UART_GET_GCTL(uart) & ~UCEN); UART_PUT_GCTL(uart, UART_GET_GCTL(uart) & ~UCEN);