Merge tag 'tty-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here is the big tty/serial driver update for 4.18-rc1.

  There's nothing major here, just lots of serial driver updates. Full
  details are in the shortlog, nothing anything specific to call out
  here.

  All have been in linux-next for a while with no reported issues"

* tag 'tty-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (55 commits)
  vt: Perform safe console erase only once
  serial: imx: disable UCR4_OREN on shutdown
  serial: imx: drop CTS/RTS handling from shutdown
  tty: fix typo in ASYNCB_FOURPORT comment
  serial: samsung: check DMA engine capabilities before using DMA mode
  tty: Fix data race in tty_insert_flip_string_fixed_flag
  tty: serial: msm_geni_serial: Fix TX infinite loop
  serial: 8250_dw: Fix runtime PM handling
  serial: 8250: omap: Fix idling of clocks for unused uarts
  tty: serial: drop ATH79 specific SoC symbols
  serial: 8250: Add missing rxtrig_bytes on Altera 16550 UART
  serial/aspeed-vuart: fix a couple mod_timer() calls
  serial: sh-sci: Use spin_{try}lock_irqsave instead of open coding version
  serial: 8250_of: Add IO space support
  tty/serial: atmel: use port->name as name in request_irq()
  serial: imx: dma_unmap_sg buffers on shutdown
  serial: imx: cleanup imx_uart_disable_dma()
  tty: serial: qcom_geni_serial: Add early console support
  tty: serial: qcom_geni_serial: Return IRQ_NONE for spurious interrupts
  tty: serial: qcom_geni_serial: Use iowrite32_rep to write to FIFO
  ...

1 files changed, 22 insertions, 21 deletions

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index c2fc6bef7a6f..4e853570ea80 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1291,18 +1291,13 @@ static void imx_uart_enable_dma(struct imx_port *sport)
 
 static void imx_uart_disable_dma(struct imx_port *sport)
 {
-        u32 ucr1, ucr2;
+        u32 ucr1;
 
         /* clear UCR1 */
         ucr1 = imx_uart_readl(sport, UCR1);
         ucr1 &= ~(UCR1_RXDMAEN | UCR1_TXDMAEN | UCR1_ATDMAEN);
         imx_uart_writel(sport, ucr1, UCR1);
 
-        /* clear UCR2 */
-        ucr2 = imx_uart_readl(sport, UCR2);
-        ucr2 &= ~(UCR2_CTSC | UCR2_CTS | UCR2_ATEN);
-        imx_uart_writel(sport, ucr2, UCR2);
-
         imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
 
         sport->dma_is_enabled = 0;
@@ -1427,13 +1422,21 @@ static void imx_uart_shutdown(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
         unsigned long flags;
-        u32 ucr1, ucr2;
+        u32 ucr1, ucr2, ucr4;
 
         if (sport->dma_is_enabled) {
-                sport->dma_is_rxing = 0;
-                sport->dma_is_txing = 0;
                 dmaengine_terminate_sync(sport->dma_chan_tx);
+                if (sport->dma_is_txing) {
+                        dma_unmap_sg(sport->port.dev, &sport->tx_sgl[0],
+                                     sport->dma_tx_nents, DMA_TO_DEVICE);
+                        sport->dma_is_txing = 0;
+                }
                 dmaengine_terminate_sync(sport->dma_chan_rx);
+                if (sport->dma_is_rxing) {
+                        dma_unmap_sg(sport->port.dev, &sport->rx_sgl,
+                                     1, DMA_FROM_DEVICE);
+                        sport->dma_is_rxing = 0;
+                }
 
                 spin_lock_irqsave(&sport->port.lock, flags);
                 imx_uart_stop_tx(port);
@@ -1449,6 +1452,10 @@ static void imx_uart_shutdown(struct uart_port *port)
         ucr2 = imx_uart_readl(sport, UCR2);
         ucr2 &= ~(UCR2_TXEN | UCR2_ATEN);
         imx_uart_writel(sport, ucr2, UCR2);
+
+        ucr4 = imx_uart_readl(sport, UCR4);
+        ucr4 &= ~UCR4_OREN;
+        imx_uart_writel(sport, ucr4, UCR4);
         spin_unlock_irqrestore(&sport->port.lock, flags);
 
         /*
@@ -2425,8 +2432,7 @@ static void imx_uart_enable_wakeup(struct imx_port *sport, bool on)
 
 static int imx_uart_suspend_noirq(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
 
         imx_uart_save_context(sport);
 
@@ -2437,8 +2443,7 @@ static int imx_uart_suspend_noirq(struct device *dev)
 
 static int imx_uart_resume_noirq(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
         int ret;
 
         ret = clk_enable(sport->clk_ipg);
@@ -2452,8 +2457,7 @@ static int imx_uart_resume_noirq(struct device *dev)
 
 static int imx_uart_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
         int ret;
 
         uart_suspend_port(&imx_uart_uart_driver, &sport->port);
@@ -2471,8 +2475,7 @@ static int imx_uart_suspend(struct device *dev)
 
 static int imx_uart_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
 
         /* disable wakeup from i.MX UART */
         imx_uart_enable_wakeup(sport, false);
@@ -2487,8 +2490,7 @@ static int imx_uart_resume(struct device *dev)
 
 static int imx_uart_freeze(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
 
         uart_suspend_port(&imx_uart_uart_driver, &sport->port);
 
@@ -2497,8 +2499,7 @@ static int imx_uart_freeze(struct device *dev)
 
 static int imx_uart_thaw(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct imx_port *sport = platform_get_drvdata(pdev);
+        struct imx_port *sport = dev_get_drvdata(dev);
 
         uart_resume_port(&imx_uart_uart_driver, &sport->port);