Commit bca476139d2ded86be146dae09b06e22548b67f3

Authored by Dick Hollenbeck
Committed by Greg Kroah-Hartman
1 parent 0813e22d4e

serial: 8250: add 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
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.

Alan:

  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.

Signed-off-by: Dick Hollenbeck <dick@softplc.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Kees Schoenmakers <k.schoenmakers@sigmae.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

drivers/serial/8250.c
... ... @@ -83,6 +83,9 @@
83 83  
84 84 #define PASS_LIMIT 256
85 85  
  86 +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
  87 +
  88 +
86 89 /*
87 90 * We default to IRQ0 for the "no irq" hack. Some
88 91 * machine types want others as well - they're free
... ... @@ -1792,7 +1795,7 @@
1792 1795 up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
1793 1796 spin_unlock_irqrestore(&up->port.lock, flags);
1794 1797  
1795   - return lsr & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
  1798 + return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;
1796 1799 }
1797 1800  
1798 1801 static unsigned int serial8250_get_mctrl(struct uart_port *port)
... ... @@ -1849,8 +1852,6 @@
1849 1852 serial_out(up, UART_LCR, up->lcr);
1850 1853 spin_unlock_irqrestore(&up->port.lock, flags);
1851 1854 }
1852   -
1853   -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
1854 1855  
1855 1856 /*
1856 1857 * Wait for transmitter & holding register to empty