summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Melki <christian.melki@ericsson.se>2012-04-30 09:21:26 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 17:40:29 (GMT)
commitf9a9111b540fd67db5dab332f4b83d86c90e27b1 (patch)
tree469a440d5c538c42c835e79c77fd3027971d0587
parentaaa10eb1d0034eccc096f583fe308f0921617598 (diff)
downloadlinux-f9a9111b540fd67db5dab332f4b83d86c90e27b1.tar.xz
8250.c: less than 2400 baud fix.
We noticed that we were loosing data at speed less than 2400 baud. It turned out our (TI16750 compatible) uart with 64 byte outgoing fifo was truncated to 16 byte (bit 5 sets fifo len) when modifying the fcr reg. The input code still fills the buffer with 64 bytes if I remember correctly and thus data is lost. Our fix was to remove whiping of the fcr content and just add the TRIGGER_1 which we want for latency. I can't see why this would not work on less than 2400 always, for all uarts ... Otherwise one would have to make sure the filling of the fifo re-checks the current state of available fifo size (urrk). Signed-off-by: Christian Melki <christian.melki@ericsson.se> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 182efcc9..c9ac4ea 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -2259,10 +2259,11 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
quot++;
if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) {
- if (baud < 2400)
- fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
- else
- fcr = uart_config[port->type].fcr;
+ fcr = uart_config[port->type].fcr;
+ if (baud < 2400) {
+ fcr &= ~UART_FCR_TRIGGER_MASK;
+ fcr |= UART_FCR_TRIGGER_1;
+ }
}
/*