From 4a31e59d88a3667fe1839fa36b440c8310905c35 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 23 Jun 2005 15:05:41 +0100
Subject: [PATCH] --- yaml --- r: 3007 b: refs/heads/master c:
 55d3b282b90620e02e825304a9433732a84c58a5 h: refs/heads/master i:   3005:
 994ac63cda69390e008547e2b52e3425be65ea18   3003:
 179d61526eac508d8022c608db560b947a7a1ba8   2999:
 10d4a438900b88aad3348b3d26b26bab56b9b9a0   2991:
 71f2994ad504aea5351b6ad2e06e4758afd6432d   2975:
 3cf864677db27a3bb86f9f0f7ef5315bab81ae4e   2943:
 08c14786d1ae166367c698e94f22ee9cd5da4a4b v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/serial/8250.c | 31 +++++++++++++++++++++++++++++++
 trunk/drivers/serial/8250.h |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 547aab2aec1c..86d67ea837b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba5e35daa90871fcb9b01f5ad1e5723343cc0a9
+refs/heads/master: 55d3b282b90620e02e825304a9433732a84c58a5
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index 27cc288e91d0..341c644591ae 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -1027,6 +1027,8 @@ static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
 	}
 }
 
+static void transmit_chars(struct uart_8250_port *up);
+
 static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
 {
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
@@ -1034,6 +1036,14 @@ static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
 	if (!(up->ier & UART_IER_THRI)) {
 		up->ier |= UART_IER_THRI;
 		serial_out(up, UART_IER, up->ier);
+
+		if (up->capabilities & UART_BUG_TXEN) {
+			unsigned char lsr, iir;
+			lsr = serial_in(up, UART_LSR);
+			iir = serial_in(up, UART_IIR);
+			if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT)
+				transmit_chars(up);
+		}
 	}
 	/*
 	 * We only do this from uart_start
@@ -1439,6 +1449,7 @@ static int serial8250_startup(struct uart_port *port)
 {
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
 	unsigned long flags;
+	unsigned char lsr, iir;
 	int retval;
 
 	up->capabilities = uart_config[up->port.type].flags;
@@ -1542,6 +1553,26 @@ static int serial8250_startup(struct uart_port *port)
 			up->port.mctrl |= TIOCM_OUT2;
 
 	serial8250_set_mctrl(&up->port, up->port.mctrl);
+
+	/*
+	 * Do a quick test to see if we receive an
+	 * interrupt when we enable the TX irq.
+	 */
+	serial_outp(up, UART_IER, UART_IER_THRI);
+	lsr = serial_in(up, UART_LSR);
+	iir = serial_in(up, UART_IIR);
+	serial_outp(up, UART_IER, 0);
+
+	if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) {
+		if (!(up->capabilities & UART_BUG_TXEN)) {
+			up->capabilities |= UART_BUG_TXEN;
+			pr_debug("ttyS%d - enabling bad tx status workarounds\n",
+				 port->line);
+		}
+	} else {
+		up->capabilities &= ~UART_BUG_TXEN;
+	}
+
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
 	/*
diff --git a/trunk/drivers/serial/8250.h b/trunk/drivers/serial/8250.h
index cd5c3dd2d910..9225c82faeb8 100644
--- a/trunk/drivers/serial/8250.h
+++ b/trunk/drivers/serial/8250.h
@@ -52,6 +52,7 @@ struct serial8250_config {
 #define UART_CAP_UUE	(1 << 12)	/* UART needs IER bit 6 set (Xscale) */
 
 #define UART_BUG_QUOT	(1 << 0)	/* UART has buggy quot LSB */
+#define UART_BUG_TXEN	(1 << 1)	/* UART has buggy TX IIR status */
 
 #if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
 #define _INLINE_ inline