Merge tag 'tty-4.15-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 pull request for 4.15-rc1.

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

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

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...

1 files changed, 20 insertions, 45 deletions

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 7551cab438ff..efa25611ca0c 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Driver for Atmel AT91 Serial ports
  *  Copyright (C) 2003 Rick Bronson
@@ -6,21 +7,6 @@
  *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
  *
  *  DMA support added by Chip Coldwell.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 #include <linux/tty.h>
 #include <linux/ioport.h>
@@ -171,6 +157,7 @@ struct atmel_uart_port {
         bool                    has_hw_timer;
         struct timer_list       uart_timer;
 
+        bool                    tx_stopped;
         bool                    suspended;
         unsigned int            pending;
         unsigned int            pending_status;
@@ -380,6 +367,10 @@ static int atmel_config_rs485(struct uart_port *port,
  */
 static u_int atmel_tx_empty(struct uart_port *port)
 {
+        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+
+        if (atmel_port->tx_stopped)
+                return TIOCSER_TEMT;
         return (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXEMPTY) ?
                 TIOCSER_TEMT :
                 0;
@@ -485,6 +476,7 @@ static void atmel_stop_tx(struct uart_port *port)
          * is fully transmitted.
          */
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXDIS);
+        atmel_port->tx_stopped = true;
 
         /* Disable interrupts */
         atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask);
@@ -521,6 +513,7 @@ static void atmel_start_tx(struct uart_port *port)
 
         /* re-enable the transmitter */
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
+        atmel_port->tx_stopped = false;
 }
 
 /*
@@ -1178,10 +1171,11 @@ chan_err:
         return -EINVAL;
 }
 
-static void atmel_uart_timer_callback(unsigned long data)
+static void atmel_uart_timer_callback(struct timer_list *t)
 {
-        struct uart_port *port = (void *)data;
-        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+        struct atmel_uart_port *atmel_port = from_timer(atmel_port, t,
+                                                        uart_timer);
+        struct uart_port *port = &atmel_port->uart;
 
         if (!atomic_read(&atmel_port->tasklet_shutdown)) {
                 tasklet_schedule(&atmel_port->tasklet_rx);
@@ -1667,29 +1661,6 @@ static void atmel_init_property(struct atmel_uart_port *atmel_port,
         }
 }
 
-static void atmel_init_rs485(struct uart_port *port,
-                                struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-
-        struct serial_rs485 *rs485conf = &port->rs485;
-        u32 rs485_delay[2];
-
-        /* rs485 properties */
-        if (of_property_read_u32_array(np, "rs485-rts-delay",
-                                       rs485_delay, 2) == 0) {
-                rs485conf->delay_rts_before_send = rs485_delay[0];
-                rs485conf->delay_rts_after_send = rs485_delay[1];
-                rs485conf->flags = 0;
-        }
-
-        if (of_get_property(np, "rs485-rx-during-tx", NULL))
-                rs485conf->flags |= SER_RS485_RX_DURING_TX;
-
-        if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL))
-                rs485conf->flags |= SER_RS485_ENABLED;
-}
-
 static void atmel_set_ops(struct uart_port *port)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
@@ -1866,10 +1837,9 @@ static int atmel_startup(struct uart_port *port)
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         /* enable xmit & rcvr */
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
 
-        setup_timer(&atmel_port->uart_timer,
-                        atmel_uart_timer_callback,
-                        (unsigned long)port);
+        timer_setup(&atmel_port->uart_timer, atmel_uart_timer_callback, 0);
 
         if (atmel_use_pdc_rx(port)) {
                 /* set UART timeout */
@@ -2122,6 +2092,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
         /* disable receiver and transmitter */
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXDIS | ATMEL_US_RXDIS);
+        atmel_port->tx_stopped = true;
 
         /* mode */
         if (port->rs485.flags & SER_RS485_ENABLED) {
@@ -2207,6 +2178,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
         atmel_uart_writel(port, ATMEL_US_BRGR, quot);
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
 
         /* restore interrupts */
         atmel_uart_writel(port, ATMEL_US_IER, imr);
@@ -2373,7 +2345,7 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port,
         atmel_init_property(atmel_port, pdev);
         atmel_set_ops(port);
 
-        atmel_init_rs485(port, pdev);
+        of_get_rs485_mode(pdev->dev.of_node, &port->rs485);
 
         port->iotype            = UPIO_MEM;
         port->flags             = UPF_BOOT_AUTOCONF | UPF_IOREMAP;
@@ -2450,6 +2422,7 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
 
         /* Make sure that tx path is actually able to send characters */
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
+        atmel_port->tx_stopped = false;
 
         uart_console_write(port, s, count, atmel_console_putchar);
 
@@ -2511,6 +2484,7 @@ static int __init atmel_console_setup(struct console *co, char *options)
 {
         int ret;
         struct uart_port *port = &atmel_ports[co->index].uart;
+        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
         int baud = 115200;
         int bits = 8;
         int parity = 'n';
@@ -2528,6 +2502,7 @@ static int __init atmel_console_setup(struct console *co, char *options)
         atmel_uart_writel(port, ATMEL_US_IDR, -1);
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN | ATMEL_US_RXEN);
+        atmel_port->tx_stopped = false;
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);