3 files changed, 106 insertions, 70 deletions

diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index f612c783170f..62d9303c2837 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -203,6 +203,9 @@ struct amba_pl011_data {
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
         void *dma_rx_param;
         void *dma_tx_param;
+        bool dma_rx_poll_enable;
+        unsigned int dma_rx_poll_rate;
+        unsigned int dma_rx_poll_timeout;
         void (*init) (void);
         void (*exit) (void);
 };
diff --git a/include/linux/tty.h b/include/linux/tty.h
index c75d886b0307..367a9dfc4ea2 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -255,9 +255,9 @@ struct tty_struct {
         int count;
         struct winsize winsize;         /* termios mutex */
         unsigned char stopped:1, hw_stopped:1, flow_stopped:1, packet:1;
-        unsigned char warned:1;
         unsigned char ctrl_status;      /* ctrl_lock */
         unsigned int receive_room;      /* Bytes free for queue */
+        int flow_change;
 
         struct tty_struct *link;
         struct fasync_struct *fasync;
@@ -315,9 +315,25 @@ struct tty_file_private {
 #define TTY_NO_WRITE_SPLIT      17      /* Preserve write boundaries to driver */
 #define TTY_HUPPED              18      /* Post driver->hangup() */
 #define TTY_HUPPING             21      /* ->hangup() in progress */
+#define TTY_LDISC_HALTED        22      /* Line discipline is halted */
 
 #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty))
 
+/* Values for tty->flow_change */
+#define TTY_THROTTLE_SAFE 1
+#define TTY_UNTHROTTLE_SAFE 2
+
+static inline void __tty_set_flow_change(struct tty_struct *tty, int val)
+{
+        tty->flow_change = val;
+}
+
+static inline void tty_set_flow_change(struct tty_struct *tty, int val)
+{
+        tty->flow_change = val;
+        smp_mb();
+}
+
 #ifdef CONFIG_TTY
 extern void console_init(void);
 extern void tty_kref_put(struct tty_struct *tty);
@@ -400,6 +416,8 @@ extern int tty_write_room(struct tty_struct *tty);
 extern void tty_driver_flush_buffer(struct tty_struct *tty);
 extern void tty_throttle(struct tty_struct *tty);
 extern void tty_unthrottle(struct tty_struct *tty);
+extern int tty_throttle_safe(struct tty_struct *tty);
+extern int tty_unthrottle_safe(struct tty_struct *tty);
 extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
 extern void tty_driver_remove_tty(struct tty_driver *driver,
                                   struct tty_struct *tty);
@@ -419,13 +437,28 @@ extern void tty_flush_to_ldisc(struct tty_struct *tty);
 extern void tty_buffer_free_all(struct tty_port *port);
 extern void tty_buffer_flush(struct tty_struct *tty);
 extern void tty_buffer_init(struct tty_port *port);
-extern speed_t tty_get_baud_rate(struct tty_struct *tty);
 extern speed_t tty_termios_baud_rate(struct ktermios *termios);
 extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
 extern void tty_termios_encode_baud_rate(struct ktermios *termios,
                                                 speed_t ibaud, speed_t obaud);
 extern void tty_encode_baud_rate(struct tty_struct *tty,
                                                 speed_t ibaud, speed_t obaud);
+
+/**
+ *      tty_get_baud_rate       -       get tty bit rates
+ *      @tty: tty to query
+ *
+ *      Returns the baud rate as an integer for this terminal. The
+ *      termios lock must be held by the caller and the terminal bit
+ *      flags may be updated.
+ *
+ *      Locking: none
+ */
+static inline speed_t tty_get_baud_rate(struct tty_struct *tty)
+{
+        return tty_termios_baud_rate(&tty->termios);
+}
+
 extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);
 extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);
 extern int tty_set_termios(struct tty_struct *tty, struct ktermios *kt);
@@ -502,6 +535,8 @@ extern int tty_port_carrier_raised(struct tty_port *port);
 extern void tty_port_raise_dtr_rts(struct tty_port *port);
 extern void tty_port_lower_dtr_rts(struct tty_port *port);
 extern void tty_port_hangup(struct tty_port *port);
+extern void tty_port_tty_hangup(struct tty_port *port, bool check_clocal);
+extern void tty_port_tty_wakeup(struct tty_port *port);
 extern int tty_port_block_til_ready(struct tty_port *port,
                                 struct tty_struct *tty, struct file *filp);
 extern int tty_port_close_start(struct tty_port *port,
@@ -526,8 +561,6 @@ extern void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty);
 extern void tty_ldisc_init(struct tty_struct *tty);
 extern void tty_ldisc_deinit(struct tty_struct *tty);
 extern void tty_ldisc_begin(void);
-/* This last one is just for the tty layer internals and shouldn't be used elsewhere */
-extern void tty_ldisc_enable(struct tty_struct *tty);
 
 
 /* n_tty.c */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 455a0d7bf220..58390c73df8b 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -9,89 +9,89 @@
  *
  * int  (*open)(struct tty_struct *);
  *
- *      This function is called when the line discipline is associated
- *      with the tty.  The line discipline can use this as an
- *      opportunity to initialize any state needed by the ldisc routines.
- * 
+ *      This function is called when the line discipline is associated
+ *      with the tty.  The line discipline can use this as an
+ *      opportunity to initialize any state needed by the ldisc routines.
+ *
  * void (*close)(struct tty_struct *);
  *
  *      This function is called when the line discipline is being
- *      shutdown, either because the tty is being closed or because
- *      the tty is being changed to use a new line discipline
- * 
+ *      shutdown, either because the tty is being closed or because
+ *      the tty is being changed to use a new line discipline
+ *
  * void (*flush_buffer)(struct tty_struct *tty);
  *
- *      This function instructs the line discipline to clear its
- *      buffers of any input characters it may have queued to be
- *      delivered to the user mode process.
- * 
+ *      This function instructs the line discipline to clear its
+ *      buffers of any input characters it may have queued to be
+ *      delivered to the user mode process.
+ *
  * ssize_t (*chars_in_buffer)(struct tty_struct *tty);
  *
- *      This function returns the number of input characters the line
+ *      This function returns the number of input characters the line
  *      discipline may have queued up to be delivered to the user mode
  *      process.
- * 
+ *
  * ssize_t (*read)(struct tty_struct * tty, struct file * file,
  *                 unsigned char * buf, size_t nr);
  *
- *      This function is called when the user requests to read from
- *      the tty.  The line discipline will return whatever characters
- *      it has buffered up for the user.  If this function is not
- *      defined, the user will receive an EIO error.
- * 
+ *      This function is called when the user requests to read from
+ *      the tty.  The line discipline will return whatever characters
+ *      it has buffered up for the user.  If this function is not
+ *      defined, the user will receive an EIO error.
+ *
  * ssize_t (*write)(struct tty_struct * tty, struct file * file,
- *                  const unsigned char * buf, size_t nr);
- *
- *      This function is called when the user requests to write to the
- *      tty.  The line discipline will deliver the characters to the
- *      low-level tty device for transmission, optionally performing
- *      some processing on the characters first.  If this function is
- *      not defined, the user will receive an EIO error.
- * 
+ *                  const unsigned char * buf, size_t nr);
+ *
+ *      This function is called when the user requests to write to the
+ *      tty.  The line discipline will deliver the characters to the
+ *      low-level tty device for transmission, optionally performing
+ *      some processing on the characters first.  If this function is
+ *      not defined, the user will receive an EIO error.
+ *
  * int  (*ioctl)(struct tty_struct * tty, struct file * file,
- *               unsigned int cmd, unsigned long arg);
+ *               unsigned int cmd, unsigned long arg);
  *
  *      This function is called when the user requests an ioctl which
- *      is not handled by the tty layer or the low-level tty driver.
- *      It is intended for ioctls which affect line discpline
- *      operation.  Note that the search order for ioctls is (1) tty
- *      layer, (2) tty low-level driver, (3) line discpline.  So a
- *      low-level driver can "grab" an ioctl request before the line
- *      discpline has a chance to see it.
- * 
+ *      is not handled by the tty layer or the low-level tty driver.
+ *      It is intended for ioctls which affect line discpline
+ *      operation.  Note that the search order for ioctls is (1) tty
+ *      layer, (2) tty low-level driver, (3) line discpline.  So a
+ *      low-level driver can "grab" an ioctl request before the line
+ *      discpline has a chance to see it.
+ *
  * long (*compat_ioctl)(struct tty_struct * tty, struct file * file,
- *                      unsigned int cmd, unsigned long arg);
+ *                      unsigned int cmd, unsigned long arg);
  *
- *      Process ioctl calls from 32-bit process on 64-bit system
+ *      Process ioctl calls from 32-bit process on 64-bit system
  *
  * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
- *      This function notifies the line discpline that a change has
- *      been made to the termios structure.
- * 
+ *      This function notifies the line discpline that a change has
+ *      been made to the termios structure.
+ *
  * int  (*poll)(struct tty_struct * tty, struct file * file,
- *                poll_table *wait);
+ *                poll_table *wait);
  *
- *      This function is called when a user attempts to select/poll on a
- *      tty device.  It is solely the responsibility of the line
- *      discipline to handle poll requests.
+ *      This function is called when a user attempts to select/poll on a
+ *      tty device.  It is solely the responsibility of the line
+ *      discipline to handle poll requests.
  *
  * void (*receive_buf)(struct tty_struct *, const unsigned char *cp,
- *                     char *fp, int count);
- *
- *      This function is called by the low-level tty driver to send
- *      characters received by the hardware to the line discpline for
- *      processing.  <cp> is a pointer to the buffer of input
- *      character received by the device.  <fp> is a pointer to a
- *      pointer of flag bytes which indicate whether a character was
- *      received with a parity error, etc.
- * 
+ *                     char *fp, int count);
+ *
+ *      This function is called by the low-level tty driver to send
+ *      characters received by the hardware to the line discpline for
+ *      processing.  <cp> is a pointer to the buffer of input
+ *      character received by the device.  <fp> is a pointer to a
+ *      pointer of flag bytes which indicate whether a character was
+ *      received with a parity error, etc.
+ *
  * void (*write_wakeup)(struct tty_struct *);
  *
- *      This function is called by the low-level tty driver to signal
- *      that line discpline should try to send more characters to the
- *      low-level driver for transmission.  If the line discpline does
- *      not have any more data to send, it can just return.
+ *      This function is called by the low-level tty driver to signal
+ *      that line discpline should try to send more characters to the
+ *      low-level driver for transmission.  If the line discpline does
+ *      not have any more data to send, it can just return.
  *
  * int (*hangup)(struct tty_struct *)
  *
@@ -115,7 +115,7 @@ struct tty_ldisc_ops {
         char    *name;
         int     num;
         int     flags;
-        
+
         /*
          * The following routines are called from above.
          */
@@ -123,19 +123,19 @@ struct tty_ldisc_ops {
         void    (*close)(struct tty_struct *);
         void    (*flush_buffer)(struct tty_struct *tty);
         ssize_t (*chars_in_buffer)(struct tty_struct *tty);
-        ssize_t (*read)(struct tty_struct * tty, struct file * file,
-                        unsigned char __user * buf, size_t nr);
-        ssize_t (*write)(struct tty_struct * tty, struct file * file,
-                         const unsigned char * buf, size_t nr); 
-        int     (*ioctl)(struct tty_struct * tty, struct file * file,
+        ssize_t (*read)(struct tty_struct *tty, struct file *file,
+                        unsigned char __user *buf, size_t nr);
+        ssize_t (*write)(struct tty_struct *tty, struct file *file,
+                         const unsigned char *buf, size_t nr);
+        int     (*ioctl)(struct tty_struct *tty, struct file *file,
                          unsigned int cmd, unsigned long arg);
-        long    (*compat_ioctl)(struct tty_struct * tty, struct file * file,
+        long    (*compat_ioctl)(struct tty_struct *tty, struct file *file,
                                 unsigned int cmd, unsigned long arg);
-        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
+        void    (*set_termios)(struct tty_struct *tty, struct ktermios *old);
         unsigned int (*poll)(struct tty_struct *, struct file *,
                              struct poll_table_struct *);
         int     (*hangup)(struct tty_struct *tty);
-        
+
         /*
          * The following routines are called from below.
          */
@@ -145,7 +145,7 @@ struct tty_ldisc_ops {
         void    (*dcd_change)(struct tty_struct *, unsigned int);
 
         struct  module *owner;
-        
+
         int refcount;
 };