Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 44 insertions, 30 deletions

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 1c0c9553bc05..7dd38047ba23 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -246,11 +246,11 @@ struct mxser_port {
         unsigned char err_shadow;
 
         struct async_icount icount; /* kernel counters for 4 input interrupts */
-        int timeout;
+        unsigned int timeout;
 
         int read_status_mask;
         int ignore_status_mask;
-        int xmit_fifo_size;
+        unsigned int xmit_fifo_size;
         int xmit_head;
         int xmit_tail;
         int xmit_cnt;
@@ -572,8 +572,9 @@ static void mxser_dtr_rts(struct tty_port *port, int on)
 static int mxser_set_baud(struct tty_struct *tty, long newspd)
 {
         struct mxser_port *info = tty->driver_data;
-        int quot = 0, baud;
+        unsigned int quot = 0, baud;
         unsigned char cval;
+        u64 timeout;
 
         if (!info->ioaddr)
                 return -1;
@@ -594,8 +595,13 @@ static int mxser_set_baud(struct tty_struct *tty, long newspd)
                 quot = 0;
         }
 
-        info->timeout = ((info->xmit_fifo_size * HZ * 10 * quot) / info->baud_base);
-        info->timeout += HZ / 50;       /* Add .02 seconds of slop */
+        /*
+         * worst case (128 * 1000 * 10 * 18432) needs 35 bits, so divide in the
+         * u64 domain
+         */
+        timeout = (u64)info->xmit_fifo_size * HZ * 10 * quot;
+        do_div(timeout, info->baud_base);
+        info->timeout = timeout + HZ / 50; /* Add .02 seconds of slop */
 
         if (quot) {
                 info->MCR |= UART_MCR_DTR;
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 583c9a0c7ecc..8c48c3784831 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -507,9 +507,14 @@ static void bcm_uart_set_termios(struct uart_port *port,
 {
         unsigned int ctl, baud, quot, ier;
         unsigned long flags;
+        int tries;
 
         spin_lock_irqsave(&port->lock, flags);
 
+        /* Drain the hot tub fully before we power it off for the winter. */
+        for (tries = 3; !bcm_uart_tx_empty(port) && tries; tries--)
+                mdelay(10);
+
         /* disable uart while changing speed */
         bcm_uart_disable(port);
         bcm_uart_flush(port);
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 849c1f9991ce..f0252184291e 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1276,7 +1276,6 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
 static int lpuart_startup(struct uart_port *port)
 {
         struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
-        int ret;
         unsigned long flags;
         unsigned char temp;
 
@@ -1291,11 +1290,6 @@ static int lpuart_startup(struct uart_port *port)
         sport->rxfifo_size = 0x1 << (((temp >> UARTPFIFO_RXSIZE_OFF) &
                 UARTPFIFO_FIFOSIZE_MASK) + 1);
 
-        ret = devm_request_irq(port->dev, port->irq, lpuart_int, 0,
-                                DRIVER_NAME, sport);
-        if (ret)
-                return ret;
-
         spin_lock_irqsave(&sport->port.lock, flags);
 
         lpuart_setup_watermark(sport);
@@ -1333,7 +1327,6 @@ static int lpuart_startup(struct uart_port *port)
 static int lpuart32_startup(struct uart_port *port)
 {
         struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
-        int ret;
         unsigned long flags;
         unsigned long temp;
 
@@ -1346,11 +1339,6 @@ static int lpuart32_startup(struct uart_port *port)
         sport->rxfifo_size = 0x1 << (((temp >> UARTFIFO_RXSIZE_OFF) &
                 UARTFIFO_FIFOSIZE_MASK) - 1);
 
-        ret = devm_request_irq(port->dev, port->irq, lpuart32_int, 0,
-                                DRIVER_NAME, sport);
-        if (ret)
-                return ret;
-
         spin_lock_irqsave(&sport->port.lock, flags);
 
         lpuart32_setup_watermark(sport);
@@ -1380,8 +1368,6 @@ static void lpuart_shutdown(struct uart_port *port)
 
         spin_unlock_irqrestore(&port->lock, flags);
 
-        devm_free_irq(port->dev, port->irq, sport);
-
         if (sport->lpuart_dma_rx_use) {
                 del_timer_sync(&sport->lpuart_timer);
                 lpuart_dma_rx_free(&sport->port);
@@ -1400,7 +1386,6 @@ static void lpuart_shutdown(struct uart_port *port)
 
 static void lpuart32_shutdown(struct uart_port *port)
 {
-        struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
         unsigned long temp;
         unsigned long flags;
 
@@ -1413,8 +1398,6 @@ static void lpuart32_shutdown(struct uart_port *port)
         lpuart32_write(port, temp, UARTCTRL);
 
         spin_unlock_irqrestore(&port->lock, flags);
-
-        devm_free_irq(port->dev, port->irq, sport);
 }
 
 static void
@@ -2212,16 +2195,22 @@ static int lpuart_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, &sport->port);
 
-        if (lpuart_is_32(sport))
+        if (lpuart_is_32(sport)) {
                 lpuart_reg.cons = LPUART32_CONSOLE;
-        else
+                ret = devm_request_irq(&pdev->dev, sport->port.irq, lpuart32_int, 0,
+                                        DRIVER_NAME, sport);
+        } else {
                 lpuart_reg.cons = LPUART_CONSOLE;
+                ret = devm_request_irq(&pdev->dev, sport->port.irq, lpuart_int, 0,
+                                        DRIVER_NAME, sport);
+        }
+
+        if (ret)
+                goto failed_irq_request;
 
         ret = uart_add_one_port(&lpuart_reg, &sport->port);
-        if (ret) {
-                clk_disable_unprepare(sport->clk);
-                return ret;
-        }
+        if (ret)
+                goto failed_attach_port;
 
         sport->dma_tx_chan = dma_request_slave_channel(sport->port.dev, "tx");
         if (!sport->dma_tx_chan)
@@ -2240,6 +2229,11 @@ static int lpuart_probe(struct platform_device *pdev)
         }
 
         return 0;
+
+failed_attach_port:
+failed_irq_request:
+        clk_disable_unprepare(sport->clk);
+        return ret;
 }
 
 static int lpuart_remove(struct platform_device *pdev)
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index cdd2f942317c..b9c7a904c1ea 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -889,7 +889,16 @@ static int sccnxp_probe(struct platform_device *pdev)
                         goto err_out;
                 uartclk = 0;
         } else {
-                clk_prepare_enable(clk);
+                ret = clk_prepare_enable(clk);
+                if (ret)
+                        goto err_out;
+
+                ret = devm_add_action_or_reset(&pdev->dev,
+                                (void(*)(void *))clk_disable_unprepare,
+                                clk);
+                if (ret)
+                        goto err_out;
+
                 uartclk = clk_get_rate(clk);
         }
 
@@ -988,7 +997,7 @@ static int sccnxp_probe(struct platform_device *pdev)
         uart_unregister_driver(&s->uart);
 err_out:
         if (!IS_ERR(s->regulator))
-                return regulator_disable(s->regulator);
+                regulator_disable(s->regulator);
 
         return ret;
 }