[PATCH] 8250 serial transmitter fully empty test

[PATCH] 8250 serial transmitter fully empty test

[Dick Hollenbeck]

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

When controlling an industrial radio modem it can be necessary to
manipulate the handshake lines in order to control the radio modem's 
transmitter, from userspace.

The transmitter should not be turned off before all characters have been 
transmitted.  serial8250_tx_empty() was reporting that all characters were transmitted 
before they actually were.


Signed-off-by: Dick Hollenbeck <dick@softplc.com>


[-- Attachment #2: 8250.diff --]
[-- Type: text/x-patch, Size: 959 bytes --]

--- drivers/serial/8250.c.orig	2009-09-26 14:06:55.000000000 -0500
+++ drivers/serial/8250.c	2009-09-26 14:12:37.000000000 -0500
@@ -81,6 +81,9 @@ static int serial_index(struct uart_port
 
 #define PASS_LIMIT	256
 
+#define BOTH_EMPTY 	(UART_LSR_TEMT | UART_LSR_THRE)
+
+
 /*
  * We default to IRQ0 for the "no irq" hack.   Some
  * machine types want others as well - they're free
@@ -1792,7 +1795,7 @@ static unsigned int serial8250_tx_empty(
 	up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
-	return lsr & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+	return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;
 }
 
 static unsigned int serial8250_get_mctrl(struct uart_port *port)
@@ -1850,8 +1853,6 @@ static void serial8250_break_ctl(struct 
 	spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-
 /*
  *	Wait for transmitter & holding register to empty
  */

Re: [PATCH] 8250 serial transmitter fully empty test

[Alan Cox]

I got further explanation on this from Kees Schoenmakers who came up
with the same patch and identified the offending devices as well as
testing it didn't seem to break other clones.

So Andrew can we drop this one back in and see if it busts anything
obscure. If it does we now know what to quirk it against should that be a
problem.

--

From: Dick Hollenbeck <dick@softplc.com>

8250: serial transmitter fully empty test

When controlling an industrial radio modem it can be necessary to
manipulate the handshake lines in order to control the radio modem's 
transmitter, from userspace.

The transmitter should not be turned off before all characters have been 
transmitted.  serial8250_tx_empty() was reporting that all characters were
transmitted before they actually were.

----------

Discovered in parallel with more testing and analysis by Kees Schoenmakers
<k.schoenmakers@sigmae.nl> as follows

I ran into an NetMos 9835 serial pci board which behaves a little different
than the standard. This type of expansion board is very common.

"Standard" 8250 compatible devices clear the 'UART_LST_TEMT" bit together
with the "UART_LSR_THRE" bit when writing data to the device.

The NetMos device does it slightly different

I believe that the TEMT bit is coupled to the shift register. The problem is
that after writing data to the device and very quickly after that one does
call serial8250_tx_empty, it returns the wrong information.

My patch makes the test more robust (and solves the problem) and it does not
affect the already correct devices.


[We may yet need to quirk this but now we know which chips we have a way to
 do that should we find this breaks some other 8250 clone  with dodgy THRE
  -- Alan]

-------------

Signed-off-by: Dick Hollenbeck <dick@softplc.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>

--- drivers/serial/8250.c.orig	2009-09-26 14:06:55.000000000 -0500
+++ drivers/serial/8250.c	2009-09-26 14:12:37.000000000 -0500
@@ -81,6 +81,9 @@ static int serial_index(struct uart_port
 
 #define PASS_LIMIT	256
 
+#define BOTH_EMPTY 	(UART_LSR_TEMT | UART_LSR_THRE)
+
+
 /*
  * We default to IRQ0 for the "no irq" hack.   Some
  * machine types want others as well - they're free
@@ -1792,7 +1795,7 @@ static unsigned int serial8250_tx_empty(
 	up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
-	return lsr & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+	return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;
 }
 
 static unsigned int serial8250_get_mctrl(struct uart_port *port)
@@ -1850,8 +1853,6 @@ static void serial8250_break_ctl(struct 
 	spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-
 /*
  *	Wait for transmitter & holding register to empty
  */