10 files changed, 81 insertions, 65 deletions

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 81f909c2101f..2d4bd3929e50 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -555,7 +555,7 @@ static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
          */
         if ((p->port.type == PORT_XR17V35X) ||
            (p->port.type == PORT_XR17D15X)) {
-                serial_out(p, UART_EXAR_SLEEP, 0xff);
+                serial_out(p, UART_EXAR_SLEEP, sleep ? 0xff : 0);
                 return;
         }
 
@@ -1520,7 +1520,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
                         status = serial8250_rx_chars(up, status);
         }
         serial8250_modem_status(up);
-        if (status & UART_LSR_THRE)
+        if (!up->dma && (status & UART_LSR_THRE))
                 serial8250_tx_chars(up);
 
         spin_unlock_irqrestore(&port->lock, flags);
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 7046769608d4..ab9096dc3849 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -20,12 +20,15 @@ static void __dma_tx_complete(void *param)
         struct uart_8250_port   *p = param;
         struct uart_8250_dma    *dma = p->dma;
         struct circ_buf         *xmit = &p->port.state->xmit;
-
-        dma->tx_running = 0;
+        unsigned long   flags;
 
         dma_sync_single_for_cpu(dma->txchan->device->dev, dma->tx_addr,
                                 UART_XMIT_SIZE, DMA_TO_DEVICE);
 
+        spin_lock_irqsave(&p->port.lock, flags);
+
+        dma->tx_running = 0;
+
         xmit->tail += dma->tx_size;
         xmit->tail &= UART_XMIT_SIZE - 1;
         p->port.icount.tx += dma->tx_size;
@@ -35,6 +38,8 @@ static void __dma_tx_complete(void *param)
 
         if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port))
                 serial8250_tx_dma(p);
+
+        spin_unlock_irqrestore(&p->port.lock, flags);
 }
 
 static void __dma_rx_complete(void *param)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2e6d8ddc4425..5d9b01aa54f4 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1226,6 +1226,7 @@ config SERIAL_BFIN_SPORT3_UART_CTSRTS
 config SERIAL_TIMBERDALE
         tristate "Support for timberdale UART"
         select SERIAL_CORE
+        depends on X86_32 || COMPILE_TEST
         ---help---
         Add support for UART controller on timberdale.
 
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index d4eda24aa68b..dacf0a09ab24 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -318,7 +318,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *
                         .src_addr = uap->port.mapbase + UART01x_DR,
                         .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
                         .direction = DMA_DEV_TO_MEM,
-                        .src_maxburst = uap->fifosize >> 1,
+                        .src_maxburst = uap->fifosize >> 2,
                         .device_fc = false,
                 };
 
@@ -2176,6 +2176,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 static int pl011_remove(struct amba_device *dev)
 {
         struct uart_amba_port *uap = amba_get_drvdata(dev);
+        bool busy = false;
         int i;
 
         uart_remove_one_port(&amba_reg, &uap->port);
@@ -2183,9 +2184,12 @@ static int pl011_remove(struct amba_device *dev)
         for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
                 if (amba_ports[i] == uap)
                         amba_ports[i] = NULL;
+                else if (amba_ports[i])
+                        busy = true;
 
         pl011_dma_remove(uap);
-        uart_unregister_driver(&amba_reg);
+        if (!busy)
+                uart_unregister_driver(&amba_reg);
         return 0;
 }
 
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 5e6fdb1ea73b..14aaea0d4131 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -368,16 +368,12 @@ static const struct uart_ops uart_clps711x_ops = {
 static void uart_clps711x_console_putchar(struct uart_port *port, int ch)
 {
         struct clps711x_port *s = dev_get_drvdata(port->dev);
+        u32 sysflg = 0;
 
         /* Wait for FIFO is not full */
-        while (1) {
-                u32 sysflg = 0;
-
+        do {
                 regmap_read(s->syscon, SYSFLG_OFFSET, &sysflg);
-                if (!(sysflg & SYSFLG_UTXFF))
-                        break;
-                cond_resched();
-        }
+        } while (sysflg & SYSFLG_UTXFF);
 
         writew(ch, port->membase + UARTDR_OFFSET);
 }
@@ -387,18 +383,14 @@ static void uart_clps711x_console_write(struct console *co, const char *c,
 {
         struct uart_port *port = clps711x_uart.state[co->index].uart_port;
         struct clps711x_port *s = dev_get_drvdata(port->dev);
+        u32 sysflg = 0;
 
         uart_console_write(port, c, n, uart_clps711x_console_putchar);
 
         /* Wait for transmitter to become empty */
-        while (1) {
-                u32 sysflg = 0;
-
+        do {
                 regmap_read(s->syscon, SYSFLG_OFFSET, &sysflg);
-                if (!(sysflg & SYSFLG_UBUSY))
-                        break;
-                cond_resched();
-        }
+        } while (sysflg & SYSFLG_UBUSY);
 }
 
 static int uart_clps711x_console_setup(struct console *co, char *options)
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 028582e924a5..c167a710dc39 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -798,6 +798,9 @@ static int efm32_uart_remove(struct platform_device *pdev)
 
 static const struct of_device_id efm32_uart_dt_ids[] = {
         {
+                .compatible = "energymicro,efm32-uart",
+        }, {
+                /* doesn't follow the "vendor,device" scheme, don't use */
                 .compatible = "efm32,uart",
         }, {
                 /* sentinel */
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index dd8b1a5458ff..08b6b9419f0d 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -225,14 +225,19 @@ static inline void serial_omap_enable_wakeirq(struct uart_omap_port *up,
         if (enable)
                 enable_irq(up->wakeirq);
         else
-                disable_irq(up->wakeirq);
+                disable_irq_nosync(up->wakeirq);
 }
 
 static void serial_omap_enable_wakeup(struct uart_omap_port *up, bool enable)
 {
         struct omap_uart_port_info *pdata = dev_get_platdata(up->dev);
 
+        if (enable == up->wakeups_enabled)
+                return;
+
         serial_omap_enable_wakeirq(up, enable);
+        up->wakeups_enabled = enable;
+
         if (!pdata || !pdata->enable_wakeup)
                 return;
 
@@ -1495,6 +1500,11 @@ static int serial_omap_suspend(struct device *dev)
         uart_suspend_port(&serial_omap_reg, &up->port);
         flush_work(&up->qos_work);
 
+        if (device_may_wakeup(dev))
+                serial_omap_enable_wakeup(up, true);
+        else
+                serial_omap_enable_wakeup(up, false);
+
         return 0;
 }
 
@@ -1502,6 +1512,9 @@ static int serial_omap_resume(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
 
+        if (device_may_wakeup(dev))
+                serial_omap_enable_wakeup(up, false);
+
         uart_resume_port(&serial_omap_reg, &up->port);
 
         return 0;
@@ -1789,6 +1802,7 @@ static int serial_omap_remove(struct platform_device *dev)
         pm_runtime_disable(up->dev);
         uart_remove_one_port(&serial_omap_reg, &up->port);
         pm_qos_remove_request(&up->pm_qos_request);
+        device_init_wakeup(&dev->dev, false);
 
         return 0;
 }
@@ -1877,17 +1891,7 @@ static int serial_omap_runtime_suspend(struct device *dev)
 
         up->context_loss_cnt = serial_omap_get_context_loss_count(up);
 
-        if (device_may_wakeup(dev)) {
-                if (!up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, true);
-                        up->wakeups_enabled = true;
-                }
-        } else {
-                if (up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, false);
-                        up->wakeups_enabled = false;
-                }
-        }
+        serial_omap_enable_wakeup(up, true);
 
         up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
         schedule_work(&up->qos_work);
@@ -1901,6 +1905,8 @@ static int serial_omap_runtime_resume(struct device *dev)
 
         int loss_cnt = serial_omap_get_context_loss_count(up);
 
+        serial_omap_enable_wakeup(up, false);
+
         if (loss_cnt < 0) {
                 dev_dbg(dev, "serial_omap_get_context_loss_count failed : %d\n",
                         loss_cnt);
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 23f459600738..1f5505e7f90d 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1446,8 +1446,8 @@ static int s3c24xx_serial_get_poll_char(struct uart_port *port)
 static void s3c24xx_serial_put_poll_char(struct uart_port *port,
                 unsigned char c)
 {
-        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-        unsigned int ucon = rd_regl(cons_uart, S3C2410_UCON);
+        unsigned int ufcon = rd_regl(port, S3C2410_UFCON);
+        unsigned int ucon = rd_regl(port, S3C2410_UCON);
 
         /* not possible to xmit on unconfigured port */
         if (!s3c24xx_port_configured(ucon))
@@ -1455,7 +1455,7 @@ static void s3c24xx_serial_put_poll_char(struct uart_port *port,
 
         while (!s3c24xx_serial_console_txrdy(port, ufcon))
                 cpu_relax();
-        wr_regb(cons_uart, S3C2410_UTXH, c);
+        wr_regb(port, S3C2410_UTXH, c);
 }
 
 #endif /* CONFIG_CONSOLE_POLL */
@@ -1463,22 +1463,23 @@ static void s3c24xx_serial_put_poll_char(struct uart_port *port,
 static void
 s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
 {
-        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-        unsigned int ucon = rd_regl(cons_uart, S3C2410_UCON);
-
-        /* not possible to xmit on unconfigured port */
-        if (!s3c24xx_port_configured(ucon))
-                return;
+        unsigned int ufcon = rd_regl(port, S3C2410_UFCON);
 
         while (!s3c24xx_serial_console_txrdy(port, ufcon))
-                barrier();
-        wr_regb(cons_uart, S3C2410_UTXH, ch);
+                cpu_relax();
+        wr_regb(port, S3C2410_UTXH, ch);
 }
 
 static void
 s3c24xx_serial_console_write(struct console *co, const char *s,
                              unsigned int count)
 {
+        unsigned int ucon = rd_regl(cons_uart, S3C2410_UCON);
+
+        /* not possible to xmit on unconfigured port */
+        if (!s3c24xx_port_configured(ucon))
+                return;
+
         uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar);
 }
 
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2cf5649a6dc0..b68550d95a40 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -89,8 +89,7 @@ static void __uart_start(struct tty_struct *tty)
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->uart_port;
 
-        if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
-            !tty->stopped && !tty->hw_stopped)
+        if (!tty->stopped && !tty->hw_stopped)
                 port->ops->start_tx(port);
 }
 
@@ -138,6 +137,11 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
                 return 1;
 
         /*
+         * Make sure the device is in D0 state.
+         */
+        uart_change_pm(state, UART_PM_STATE_ON);
+
+        /*
          * Initialise and allocate the transmit and temporary
          * buffer.
          */
@@ -826,25 +830,29 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
                  * If we fail to request resources for the
                  * new port, try to restore the old settings.
                  */
-                if (retval && old_type != PORT_UNKNOWN) {
+                if (retval) {
                         uport->iobase = old_iobase;
                         uport->type = old_type;
                         uport->hub6 = old_hub6;
                         uport->iotype = old_iotype;
                         uport->regshift = old_shift;
                         uport->mapbase = old_mapbase;
-                        retval = uport->ops->request_port(uport);
-                        /*
-                         * If we failed to restore the old settings,
-                         * we fail like this.
-                         */
-                        if (retval)
-                                uport->type = PORT_UNKNOWN;
 
-                        /*
-                         * We failed anyway.
-                         */
-                        retval = -EBUSY;
+                        if (old_type != PORT_UNKNOWN) {
+                                retval = uport->ops->request_port(uport);
+                                /*
+                                 * If we failed to restore the old settings,
+                                 * we fail like this.
+                                 */
+                                if (retval)
+                                        uport->type = PORT_UNKNOWN;
+
+                                /*
+                                 * We failed anyway.
+                                 */
+                                retval = -EBUSY;
+                        }
+
                         /* Added to return the correct error -Ram Gupta */
                         goto exit;
                 }
@@ -1452,6 +1460,8 @@ static void uart_hangup(struct tty_struct *tty)
                 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
                 spin_unlock_irqrestore(&port->lock, flags);
                 tty_port_tty_set(port, NULL);
+                if (!uart_console(state->uart_port))
+                        uart_change_pm(state, UART_PM_STATE_OFF);
                 wake_up_interruptible(&port->open_wait);
                 wake_up_interruptible(&port->delta_msr_wait);
         }
@@ -1570,12 +1580,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         }
 
         /*
-         * Make sure the device is in D0 state.
-         */
-        if (port->count == 1)
-                uart_change_pm(state, UART_PM_STATE_ON);
-
-        /*
          * Start up the serial port.
          */
         retval = uart_startup(tty, state, 0);
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index 21e6e84c0df8..dd3a96e07026 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -295,7 +295,7 @@ static void asc_receive_chars(struct uart_port *port)
                         status & ASC_STA_OE) {
 
                         if (c & ASC_RXBUF_FE) {
-                                if (c == ASC_RXBUF_FE) {
+                                if (c == (ASC_RXBUF_FE | ASC_RXBUF_DUMMY_RX)) {
                                         port->icount.brk++;
                                         if (uart_handle_break(port))
                                                 continue;
@@ -325,7 +325,7 @@ static void asc_receive_chars(struct uart_port *port)
                                 flag = TTY_FRAME;
                 }
 
-                if (uart_handle_sysrq_char(port, c))
+                if (uart_handle_sysrq_char(port, c & 0xff))
                         continue;
 
                 uart_insert_char(port, c, ASC_RXBUF_DUMMY_OE, c & 0xff, flag);