Commit 15bc20c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial fixes from Greg KH:
 "Here are a few small TTY/Serial/vt fixes for 5.9-rc3

  Included in here are:
   - qcom serial fixes
   - vt ioctl and core bugfixes
   - pl011 serial driver fixes
   - 8250 serial driver fixes
   - other misc serial driver fixes

  and for good measure:
   - fbcon fix for syzbot found problem.

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

* tag 'tty-5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: serial: imx: add dependence and build for earlycon
  serial: samsung: Removes the IRQ not found warning
  serial: 8250: change lock order in serial8250_do_startup()
  serial: stm32: avoid kernel warning on absence of optional IRQ
  serial: pl011: Fix oops on -EPROBE_DEFER
  serial: pl011: Don't leak amba_ports entry on driver register error
  serial: 8250_exar: Fix number of ports for Commtech PCIe cards
  tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup
  serial: qcom_geni_serial: Fix recent kdb hang
  vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
  fbcon: prevent user font height or width change from causing potential out-of-bounds access
  vt: defer kfree() of vc_screenbuf in vc_do_resize()
parents 27563ab6 ea1fc02e

drivers/tty/serial/8250/8250_exar.c

+21 −3
Original line number Diff line number Diff line
@@ -744,6 +744,24 @@ static const struct exar8250_board pbn_exar_XR17V35x = { 
	.exit		= pci_xr17v35x_exit,

};



static const struct exar8250_board pbn_fastcom35x_2 = {

	.num_ports	= 2,

	.setup		= pci_xr17v35x_setup,

	.exit		= pci_xr17v35x_exit,

};



static const struct exar8250_board pbn_fastcom35x_4 = {

	.num_ports	= 4,

	.setup		= pci_xr17v35x_setup,

	.exit		= pci_xr17v35x_exit,

};



static const struct exar8250_board pbn_fastcom35x_8 = {

	.num_ports	= 8,

	.setup		= pci_xr17v35x_setup,

	.exit		= pci_xr17v35x_exit,

};



static const struct exar8250_board pbn_exar_XR17V4358 = {

	.num_ports	= 12,

	.setup		= pci_xr17v35x_setup,
@@ -811,9 +829,9 @@ static const struct pci_device_id exar_pci_tbl[] = { 
	EXAR_DEVICE(EXAR, XR17V358, pbn_exar_XR17V35x),

	EXAR_DEVICE(EXAR, XR17V4358, pbn_exar_XR17V4358),

	EXAR_DEVICE(EXAR, XR17V8358, pbn_exar_XR17V8358),

	EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_exar_XR17V35x),

	EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_fastcom35x_2),

	EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_fastcom35x_4),

	EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_fastcom35x_8),



	EXAR_DEVICE(COMMTECH, 4222PCI335, pbn_fastcom335_2),

	EXAR_DEVICE(COMMTECH, 4224PCI335, pbn_fastcom335_4),

drivers/tty/serial/8250/8250_port.c

+6 −3
Original line number Diff line number Diff line
@@ -2275,6 +2275,10 @@ int serial8250_do_startup(struct uart_port *port) 


	if (port->irq && !(up->port.flags & UPF_NO_THRE_TEST)) {

		unsigned char iir1;



		if (port->irqflags & IRQF_SHARED)

			disable_irq_nosync(port->irq);



		/*

		 * Test for UARTs that do not reassert THRE when the

		 * transmitter is idle and the interrupt has already
@@ -2284,8 +2288,6 @@ int serial8250_do_startup(struct uart_port *port) 
		 * allow register changes to become visible.

		 */

		spin_lock_irqsave(&port->lock, flags);

		if (up->port.irqflags & IRQF_SHARED)

			disable_irq_nosync(port->irq);



		wait_for_xmitr(up, UART_LSR_THRE);

		serial_port_out_sync(port, UART_IER, UART_IER_THRI);
@@ -2297,9 +2299,10 @@ int serial8250_do_startup(struct uart_port *port) 
		iir = serial_port_in(port, UART_IIR);

		serial_port_out(port, UART_IER, 0);



		spin_unlock_irqrestore(&port->lock, flags);



		if (port->irqflags & IRQF_SHARED)

			enable_irq(port->irq);

		spin_unlock_irqrestore(&port->lock, flags);



		/*

		 * If the interrupt is not reasserted, or we otherwise

drivers/tty/serial/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ config SERIAL_IMX_CONSOLE 


config SERIAL_IMX_EARLYCON

	bool "Earlycon on IMX serial port"

	depends on ARCH_MXC || COMPILE_TEST

	depends on OF

	select SERIAL_EARLYCON

	help

drivers/tty/serial/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_SERIAL_ZS) += zs.o 
obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o

obj-$(CONFIG_SERIAL_CPM) += cpm_uart/

obj-$(CONFIG_SERIAL_IMX) += imx.o

obj-$(CONFIG_SERIAL_IMX_EARLYCON) += imx_earlycon.o

obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o

obj-$(CONFIG_SERIAL_ICOM) += icom.o

obj-$(CONFIG_SERIAL_MESON) += meson_uart.o

drivers/tty/serial/amba-pl011.c

+9 −7
Original line number Diff line number Diff line
@@ -2241,8 +2241,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) 
	clk_disable(uap->clk);

}



static void __init

pl011_console_get_options(struct uart_amba_port *uap, int *baud,

static void pl011_console_get_options(struct uart_amba_port *uap, int *baud,

				      int *parity, int *bits)

{

	if (pl011_read(uap, REG_CR) & UART01x_CR_UARTEN) {
@@ -2276,7 +2275,7 @@ pl011_console_get_options(struct uart_amba_port *uap, int *baud, 
	}

}



static int __init pl011_console_setup(struct console *co, char *options)

static int pl011_console_setup(struct console *co, char *options)

{

	struct uart_amba_port *uap;

	int baud = 38400;
@@ -2344,7 +2343,7 @@ static int __init pl011_console_setup(struct console *co, char *options) 
 *

 *	Returns 0 if console matches; otherwise non-zero to use default matching

 */

static int __init pl011_console_match(struct console *co, char *name, int idx,

static int pl011_console_match(struct console *co, char *name, int idx,

			       char *options)

{

	unsigned char iotype;
@@ -2615,7 +2614,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, 


static int pl011_register_port(struct uart_amba_port *uap)

{

	int ret;

	int ret, i;



	/* Ensure interrupts from this UART are masked and cleared */

	pl011_write(0, uap, REG_IMSC);
@@ -2626,6 +2625,9 @@ static int pl011_register_port(struct uart_amba_port *uap) 
		if (ret < 0) {

			dev_err(uap->port.dev,

				"Failed to register AMBA-PL011 driver\n");

			for (i = 0; i < ARRAY_SIZE(amba_ports); i++)

				if (amba_ports[i] == uap)

					amba_ports[i] = NULL;

			return ret;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE