Mercurial > hg > aboriginal

annotate sources/patches/linux-unbreakppc.patch @ 1686:6a9e561b3405 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1.2.8 release announcement.
author Rob Landley <rob@landley.net>
date Tue, 09 Sep 2014 06:45:00 -0500
parents e495d01ad5b3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1678
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 Reverse a commit that completely broke powerpc serial output.
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
2
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
3 commit 717f3bbab3c7628736ef738fdbf3d9a28578c26c
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 Author: Seth Bollinger <sethb@digi.com>
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 Date: Tue Mar 25 12:55:37 2014 -0500
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
6
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 serial_core: Fix conditional start_tx on ring buffer not empty
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
8
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 If the serial_core ring buffer empties just as the tty layer receives
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 an XOFF, then start_tx will never be called when the tty layer
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 receives an XON as the serial_core ring buffer is empty. This will
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 possibly leave a few bytes trapped in the fifo for drivers that
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 disable the transmitter when flow controlled.
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
14
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 Signed-off-by: Seth Bollinger <sethb@digi.com>
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
17
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
19 index 2cf5649..dd1a7be 100644
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
20 --- a/drivers/tty/serial/serial_core.c
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 +++ b/drivers/tty/serial/serial_core.c
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
22 @@ -89,7 +89,8 @@ static void __uart_start(struct tty_struct *tty)
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
23 struct uart_state *state = tty->driver_data;
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
24 struct uart_port *port = state->uart_port;
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
25
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
26 - if (!tty->stopped && !tty->hw_stopped)
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
27 + if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
28 + !tty->stopped && !tty->hw_stopped)
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
29 port->ops->start_tx(port);
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
30 }
e495d01ad5b3 Powerpc serial didn't work in the 3.15 kernel, revert the patch that broke it.
Rob Landley <rob@landley.net>
parents:
diff changeset
31