Merge branch 'linus' into tmp.x86.mpparse.new

8 files changed, 55 insertions, 66 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 1400ea6a2491..1bc00b721e9d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -43,7 +43,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/serial.h>
 
 #include "8250.h"
 
@@ -93,6 +92,7 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
  */
 #define CONFIG_HUB6 1
 
+#include <asm/serial.h>
 /*
  * SERIAL_PORT_DFNS tells us about built-in ports that have no
  * standard enumeration mechanism.   Platforms that can find all
@@ -1547,8 +1547,6 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
                 i->head = &up->list;
                 spin_unlock_irq(&i->lock);
 
-                irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
-
                 ret = request_irq(up->port.irq, serial8250_interrupt,
                                   irq_flags, "serial", i);
                 if (ret < 0)
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index a10a40cc0d9e..91bd28f2bb47 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -78,8 +78,3 @@ struct serial8250_config {
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif
-
-#ifndef SERIAL_EXTRA_IRQ_FLAGS
-#define SERIAL_EXTRA_IRQ_FLAGS 0
-#endif
-
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 53fa19cf2f06..788c3559522d 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2602,7 +2602,12 @@ static struct pci_device_id serial_pci_tbl[] = {
         {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,   /* 135a.0811 */
                 pbn_b2_2_115200 },
-
+        /*
+         * IntaShield IS-400
+         */
+        {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,    /* 135a.0dc0 */
+                pbn_b2_4_115200 },
         /*
          * Perle PCI-RAS cards
          */
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index c065a704a93a..42be8b01a40f 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1318,7 +1318,7 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud,
          * If the baud rate generator isn't running, the port wasn't
          * initialized by the boot loader.
          */
-        quot = UART_GET_BRGR(port);
+        quot = UART_GET_BRGR(port) & ATMEL_US_CD;
         if (!quot)
                 return;
 
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index d6b4ead693b7..fd9bb777df28 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -49,6 +49,7 @@
 #define DMA_RX_YCOUNT           (PAGE_SIZE / DMA_RX_XCOUNT)
 
 #define DMA_RX_FLUSH_JIFFIES    (HZ / 50)
+#define CTS_CHECK_JIFFIES       (HZ / 50)
 
 #ifdef CONFIG_SERIAL_BFIN_DMA
 static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart);
@@ -290,11 +291,6 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
 {
         struct circ_buf *xmit = &uart->port.info->xmit;
 
-        if (uart->port.x_char) {
-                UART_PUT_CHAR(uart, uart->port.x_char);
-                uart->port.icount.tx++;
-                uart->port.x_char = 0;
-        }
         /*
          * Check the modem control lines before
          * transmitting anything.
@@ -306,6 +302,12 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
                 return;
         }
 
+        if (uart->port.x_char) {
+                UART_PUT_CHAR(uart, uart->port.x_char);
+                uart->port.icount.tx++;
+                uart->port.x_char = 0;
+        }
+
         while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) {
                 UART_PUT_CHAR(uart, xmit->buf[xmit->tail]);
                 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
@@ -345,15 +347,6 @@ static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
 }
 #endif
 
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-static void bfin_serial_do_work(struct work_struct *work)
-{
-        struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue);
-
-        bfin_serial_mctrl_check(uart);
-}
-#endif
-
 #ifdef CONFIG_SERIAL_BFIN_DMA
 static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 {
@@ -361,6 +354,12 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 
         uart->tx_done = 0;
 
+        /*
+         * Check the modem control lines before
+         * transmitting anything.
+         */
+        bfin_serial_mctrl_check(uart);
+
         if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
                 uart->tx_count = 0;
                 uart->tx_done = 1;
@@ -373,12 +372,6 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
                 uart->port.x_char = 0;
         }
 
-        /*
-         * Check the modem control lines before
-         * transmitting anything.
-         */
-        bfin_serial_mctrl_check(uart);
-
         uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
         if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail))
                 uart->tx_count = UART_XMIT_SIZE - xmit->tail;
@@ -530,11 +523,7 @@ static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
         if (uart->cts_pin < 0)
                 return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
 
-# ifdef BF54x
-        if (UART_GET_MSR(uart) & CTS)
-# else
-        if (gpio_get_value(uart->cts_pin))
-# endif
+        if (UART_GET_CTS(uart))
                 return TIOCM_DSR | TIOCM_CAR;
         else
 #endif
@@ -549,17 +538,9 @@ static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
                 return;
 
         if (mctrl & TIOCM_RTS)
-# ifdef BF54x
-                UART_PUT_MCR(uart, UART_GET_MCR(uart) & ~MRTS);
-# else
-                gpio_set_value(uart->rts_pin, 0);
-# endif
+                UART_CLEAR_RTS(uart);
         else
-# ifdef BF54x
-                UART_PUT_MCR(uart, UART_GET_MCR(uart) | MRTS);
-# else
-                gpio_set_value(uart->rts_pin, 1);
-# endif
+                UART_SET_RTS(uart);
 #endif
 }
 
@@ -577,7 +558,10 @@ static void bfin_serial_mctrl_check(struct bfin_serial_port *uart)
         uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
         if (!(status & TIOCM_CTS)) {
                 tty->hw_stopped = 1;
-                schedule_work(&uart->cts_workqueue);
+                uart->cts_timer.data = (unsigned long)(uart);
+                uart->cts_timer.function = (void *)bfin_serial_mctrl_check;
+                uart->cts_timer.expires = jiffies + CTS_CHECK_JIFFIES;
+                add_timer(&(uart->cts_timer));
         } else {
                 tty->hw_stopped = 0;
         }
@@ -752,11 +736,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
 
         /* Disable UART */
         ier = UART_GET_IER(uart);
-#ifdef CONFIG_BF54x
-        UART_CLEAR_IER(uart, 0xF);
-#else
-        UART_PUT_IER(uart, 0);
-#endif
+        UART_DISABLE_INTS(uart);
 
         /* Set DLAB in LCR to Access DLL and DLH */
         UART_SET_DLAB(uart);
@@ -771,11 +751,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
         UART_PUT_LCR(uart, lcr);
 
         /* Enable UART */
-#ifdef CONFIG_BF54x
-        UART_SET_IER(uart, ier);
-#else
-        UART_PUT_IER(uart, ier);
-#endif
+        UART_ENABLE_INTS(uart, ier);
 
         val = UART_GET_GCTL(uart);
         val |= UCEN;
@@ -833,15 +809,15 @@ bfin_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
  * Enable the IrDA function if tty->ldisc.num is N_IRDA.
  * In other cases, disable IrDA function.
  */
-static void bfin_set_ldisc(struct tty_struct *tty)
+static void bfin_serial_set_ldisc(struct uart_port *port)
 {
-        int line = tty->index;
+        int line = port->line;
         unsigned short val;
 
-        if (line >= tty->driver->num)
+        if (line >= port->info->tty->driver->num)
                 return;
 
-        switch (tty->ldisc.num) {
+        switch (port->info->tty->ldisc.num) {
         case N_IRDA:
                 val = UART_GET_GCTL(&bfin_serial_ports[line]);
                 val |= (IREN | RPOLC);
@@ -866,6 +842,7 @@ static struct uart_ops bfin_serial_pops = {
         .startup        = bfin_serial_startup,
         .shutdown       = bfin_serial_shutdown,
         .set_termios    = bfin_serial_set_termios,
+        .set_ldisc      = bfin_serial_set_ldisc,
         .type           = bfin_serial_type,
         .release_port   = bfin_serial_release_port,
         .request_port   = bfin_serial_request_port,
@@ -904,7 +881,7 @@ static void __init bfin_serial_init_ports(void)
                 init_timer(&(bfin_serial_ports[i].rx_dma_timer));
 #endif
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
-                INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work);
+                init_timer(&(bfin_serial_ports[i].cts_timer));
                 bfin_serial_ports[i].cts_pin        =
                         bfin_serial_resource[i].uart_cts_pin;
                 bfin_serial_ports[i].rts_pin        =
@@ -1206,7 +1183,6 @@ static int __init bfin_serial_init(void)
 
         ret = uart_register_driver(&bfin_serial_reg);
         if (ret == 0) {
-                bfin_serial_reg.tty_driver->set_ldisc = bfin_set_ldisc;
                 ret = platform_driver_register(&bfin_serial_driver);
                 if (ret) {
                         pr_debug("uart register failed\n");
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 2d6c08b3dbcf..f8e1447a022a 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -924,7 +924,7 @@ console_initcall(sbd_serial_console_init);
 
 static struct uart_driver sbd_reg = {
         .owner          = THIS_MODULE,
-        .driver_name    = "serial",
+        .driver_name    = "sb1250_duart",
         .dev_name       = "duart",
         .major          = TTY_MAJOR,
         .minor          = SB1250_DUART_MINOR_BASE,
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index eab032733790..42d2e108b679 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1165,6 +1165,15 @@ out:
         return ret;
 }
 
+static void uart_set_ldisc(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+
+        if (port->ops->set_ldisc)
+                port->ops->set_ldisc(port);
+}
+
 static void uart_set_termios(struct tty_struct *tty,
                                                 struct ktermios *old_termios)
 {
@@ -1982,7 +1991,9 @@ struct uart_match {
 static int serial_match_port(struct device *dev, void *data)
 {
         struct uart_match *match = data;
-        dev_t devt = MKDEV(match->driver->major, match->driver->minor) + match->port->line;
+        struct tty_driver *tty_drv = match->driver->tty_driver;
+        dev_t devt = MKDEV(tty_drv->major, tty_drv->minor_start) +
+                match->port->line;
 
         return dev->devt == devt; /* Actually, only one tty per port */
 }
@@ -2054,6 +2065,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
 int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
 {
         struct uart_state *state = drv->state + port->line;
+        struct device *tty_dev;
+        struct uart_match match = {port, drv};
 
         mutex_lock(&state->mutex);
 
@@ -2063,7 +2076,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                 return 0;
         }
 
-        if (!port->suspended) {
+        tty_dev = device_find_child(port->dev, &match, serial_match_port);
+        if (!port->suspended && device_may_wakeup(tty_dev)) {
                 disable_irq_wake(port->irq);
                 mutex_unlock(&state->mutex);
                 return 0;
@@ -2285,6 +2299,7 @@ static const struct tty_operations uart_ops = {
         .unthrottle     = uart_unthrottle,
         .send_xchar     = uart_send_xchar,
         .set_termios    = uart_set_termios,
+        .set_ldisc      = uart_set_ldisc,
         .stop           = uart_stop,
         .start          = uart_start,
         .hangup         = uart_hangup,
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 01917c433f17..566a8b42e05a 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -195,7 +195,7 @@ struct uart_qe_port {
 
 static struct uart_driver ucc_uart_driver = {
         .owner          = THIS_MODULE,
-        .driver_name    = "serial",
+        .driver_name    = "ucc_uart",
         .dev_name       = "ttyQE",
         .major          = SERIAL_QE_MAJOR,
         .minor          = SERIAL_QE_MINOR,