Commit 1a4ee867 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial fixes from Greg KH:
 "Here are some small tty and serial driver fixes for 5.5-rc3.

  Only four small patches here:

   - atmel serial driver fix

   - msm_serial driver fix

   - sprd serial driver fix

   - tty core port fix

  The last tty core fix should resolve a long-standing bug with a race
  at port creation time that some people would see, and Sudip finally
  tracked down.

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

* tag 'tty-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty/serial: atmel: fix out of range clock divider handling
  tty: link tty and port before configuring it as console
  serial: sprd: Add clearing break interrupt operation
  tty: serial: msm_serial: Fix lockup for sysrq and oops
parents 7181aba1 cb47b9f8

drivers/tty/serial/atmel_serial.c

+22 −21
Original line number Diff line number Diff line
@@ -2270,27 +2270,6 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 
		mode |= ATMEL_US_USMODE_NORMAL;

	}



	/* set the mode, clock divisor, parity, stop bits and data size */

	atmel_uart_writel(port, ATMEL_US_MR, mode);



	/*

	 * when switching the mode, set the RTS line state according to the

	 * new mode, otherwise keep the former state

	 */

	if ((old_mode & ATMEL_US_USMODE) != (mode & ATMEL_US_USMODE)) {

		unsigned int rts_state;



		if ((mode & ATMEL_US_USMODE) == ATMEL_US_USMODE_HWHS) {

			/* let the hardware control the RTS line */

			rts_state = ATMEL_US_RTSDIS;

		} else {

			/* force RTS line to low level */

			rts_state = ATMEL_US_RTSEN;

		}



		atmel_uart_writel(port, ATMEL_US_CR, rts_state);

	}



	/*

	 * Set the baud rate:

	 * Fractional baudrate allows to setup output frequency more
@@ -2317,6 +2296,28 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 


	if (!(port->iso7816.flags & SER_ISO7816_ENABLED))

		atmel_uart_writel(port, ATMEL_US_BRGR, quot);



	/* set the mode, clock divisor, parity, stop bits and data size */

	atmel_uart_writel(port, ATMEL_US_MR, mode);



	/*

	 * when switching the mode, set the RTS line state according to the

	 * new mode, otherwise keep the former state

	 */

	if ((old_mode & ATMEL_US_USMODE) != (mode & ATMEL_US_USMODE)) {

		unsigned int rts_state;



		if ((mode & ATMEL_US_USMODE) == ATMEL_US_USMODE_HWHS) {

			/* let the hardware control the RTS line */

			rts_state = ATMEL_US_RTSDIS;

		} else {

			/* force RTS line to low level */

			rts_state = ATMEL_US_RTSEN;

		}



		atmel_uart_writel(port, ATMEL_US_CR, rts_state);

	}



	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;

drivers/tty/serial/msm_serial.c

+11 −2
Original line number Diff line number Diff line
@@ -1580,6 +1580,7 @@ static void __msm_console_write(struct uart_port *port, const char *s, 
	int num_newlines = 0;

	bool replaced = false;

	void __iomem *tf;

	int locked = 1;



	if (is_uartdm)

		tf = port->membase + UARTDM_TF;
@@ -1592,7 +1593,13 @@ static void __msm_console_write(struct uart_port *port, const char *s, 
			num_newlines++;

	count += num_newlines;



	if (port->sysrq)

		locked = 0;

	else if (oops_in_progress)

		locked = spin_trylock(&port->lock);

	else

		spin_lock(&port->lock);



	if (is_uartdm)

		msm_reset_dm_count(port, count);
@@ -1628,6 +1635,8 @@ static void __msm_console_write(struct uart_port *port, const char *s, 
		iowrite32_rep(tf, buf, 1);

		i += num_chars;

	}



	if (locked)

		spin_unlock(&port->lock);

}

drivers/tty/serial/serial_core.c

+1 −0
Original line number Diff line number Diff line
@@ -2834,6 +2834,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) 
	if (uport->cons && uport->dev)

		of_console_check(uport->dev->of_node, uport->cons->name, uport->line);



	tty_port_link_device(port, drv->tty_driver, uport->line);

	uart_configure_port(drv, state, uport);



	port->console = uart_console(uport);

drivers/tty/serial/sprd_serial.c

+3 −0
Original line number Diff line number Diff line
@@ -679,6 +679,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id) 
	if (ims & SPRD_IMSR_TIMEOUT)

		serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT);



	if (ims & SPRD_IMSR_BREAK_DETECT)

		serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT);



	if (ims & (SPRD_IMSR_RX_FIFO_FULL | SPRD_IMSR_BREAK_DETECT |

		   SPRD_IMSR_TIMEOUT))

		sprd_rx(port);

drivers/tty/tty_port.c

+2 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ void tty_port_link_device(struct tty_port *port, 
{

	if (WARN_ON(index >= driver->num))

		return;

	if (!driver->ports[index])

		driver->ports[index] = port;

}

EXPORT_SYMBOL_GPL(tty_port_link_device);

CRA Git | Maintained and supported by SUSTech CRA and CCSE