Commit 82c87e7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver fixes from Greg KH:
 "Here are some small tty and serial driver fixes for 5.4-rc3 that
  resolve a number of reported issues and regressions.

  None of these are huge, full details are in the shortlog. There's also
  a MAINTAINERS update that I think you might have already taken in your
  tree already, but git should handle that merge easily.

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

* tag 'tty-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  MAINTAINERS: kgdb: Add myself as a reviewer for kgdb/kdb
  tty: serial: imx: Use platform_get_irq_optional() for optional IRQs
  serial: fix kernel-doc warning in comments
  serial: 8250_omap: Fix gpio check for auto RTS/CTS
  serial: mctrl_gpio: Check for NULL pointer
  tty: serial: fsl_lpuart: Fix lpuart_flush_buffer()
  tty: serial: Fix PORT_LINFLEXUART definition
  tty: n_hdlc: fix build on SPARC
  serial: uartps: Fix uartps_major handling
  serial: uartlite: fix exit path null pointer
  tty: serial: linflexuart: Fix magic SysRq handling
  serial: sh-sci: Use platform_get_irq_optional() for optional interrupts
  dt-bindings: serial: sh-sci: Document r8a774b1 bindings
  serial/sifive: select SERIAL_EARLYCON
  tty: serial: rda: Fix the link time qualifier of 'rda_uart_exit()'
  tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()'
parents 6c90bbd0 10deeac9

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ Required properties: 
    - "renesas,hscif-r8a77470" for R8A77470 (RZ/G1C) HSCIF compatible UART.

    - "renesas,scif-r8a774a1" for R8A774A1 (RZ/G2M) SCIF compatible UART.

    - "renesas,hscif-r8a774a1" for R8A774A1 (RZ/G2M) HSCIF compatible UART.

    - "renesas,scif-r8a774b1" for R8A774B1 (RZ/G2N) SCIF compatible UART.

    - "renesas,hscif-r8a774b1" for R8A774B1 (RZ/G2N) HSCIF compatible UART.

    - "renesas,scif-r8a774c0" for R8A774C0 (RZ/G2E) SCIF compatible UART.

    - "renesas,hscif-r8a774c0" for R8A774C0 (RZ/G2E) HSCIF compatible UART.

    - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.

drivers/tty/n_hdlc.c

+5 −0
Original line number Diff line number Diff line
@@ -968,6 +968,11 @@ static int __init n_hdlc_init(void) 
	

}	/* end of init_module() */



#ifdef CONFIG_SPARC

#undef __exitdata

#define __exitdata

#endif



static const char hdlc_unregister_ok[] __exitdata =

	KERN_INFO "N_HDLC: line discipline unregistered\n";

static const char hdlc_unregister_fail[] __exitdata =

drivers/tty/serial/8250/8250_omap.c

+3 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void omap8250_set_mctrl(struct uart_port *port, unsigned int mctrl) 


	serial8250_do_set_mctrl(port, mctrl);



	if (!up->gpios) {

	if (!mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_RTS)) {

		/*

		 * Turn off autoRTS if RTS is lowered and restore autoRTS

		 * setting if RTS is raised
@@ -456,7 +456,8 @@ static void omap_8250_set_termios(struct uart_port *port, 
	up->port.status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS | UPSTAT_AUTOXOFF);



	if (termios->c_cflag & CRTSCTS && up->port.flags & UPF_HARD_FLOW &&

	    !up->gpios) {

	    !mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_RTS) &&

	    !mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_CTS)) {

		/* Enable AUTOCTS (autoRTS is enabled when RTS is raised) */

		up->port.status |= UPSTAT_AUTOCTS | UPSTAT_AUTORTS;

		priv->efr |= UART_EFR_CTS;

drivers/tty/serial/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,7 @@ config SERIAL_SIFIVE_CONSOLE 
	bool "Console on SiFive UART"

	depends on SERIAL_SIFIVE=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_EARLYCON

	help

	  Select this option if you would like to use a SiFive UART as the

	  system console.

drivers/tty/serial/fsl_linflexuart.c

+14 −7
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Freescale linflexuart serial port driver

 *

 * Copyright 2012-2016 Freescale Semiconductor, Inc.

 * Copyright 2017-2018 NXP

 * Copyright 2017-2019 NXP

 */



#if defined(CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE) && \
@@ -246,12 +246,14 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) 
	struct tty_port *port = &sport->state->port;

	unsigned long flags, status;

	unsigned char rx;

	bool brk;



	spin_lock_irqsave(&sport->lock, flags);



	status = readl(sport->membase + UARTSR);

	while (status & LINFLEXD_UARTSR_RMB) {

		rx = readb(sport->membase + BDRM);

		brk = false;

		flg = TTY_NORMAL;

		sport->icount.rx++;
@@ -261,8 +263,11 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) 
				status |= LINFLEXD_UARTSR_SZF;

			if (status & LINFLEXD_UARTSR_BOF)

				status |= LINFLEXD_UARTSR_BOF;

			if (status & LINFLEXD_UARTSR_FEF)

			if (status & LINFLEXD_UARTSR_FEF) {

				if (!rx)

					brk = true;

				status |= LINFLEXD_UARTSR_FEF;

			}

			if (status & LINFLEXD_UARTSR_PE)

				status |=  LINFLEXD_UARTSR_PE;

		}
@@ -271,14 +276,16 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) 
		       sport->membase + UARTSR);

		status = readl(sport->membase + UARTSR);



		if (brk) {

			uart_handle_break(sport);

		} else {

#ifdef SUPPORT_SYSRQ

			if (uart_handle_sysrq_char(sport, (unsigned char)rx))

				continue;



#ifdef SUPPORT_SYSRQ

			sport->sysrq = 0;

#endif

			tty_insert_flip_char(port, rx, flg);

		}

	}



	spin_unlock_irqrestore(&sport->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE