Commit 5cdfdd6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-6.3-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 6.3-rc3 to resolve
  some reported issues.

  They include:

   - 8250 driver Kconfig issue pointed out by you that showed up in -rc1

   - qcom-geni serial driver fixes

   - various 8250 driver fixes for reported problems

   - fsl_lpuart driver fixes

   - serdev fix for regression in -rc1

   - vt.c bugfix

  All have been in linux-next for over a week with no reported problems"

* tag 'tty-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: vt: protect KD_FONT_OP_GET_TALL from unbound access
  serial: qcom-geni: drop bogus uart_write_wakeup()
  serial: qcom-geni: fix mapping of empty DMA buffer
  serial: qcom-geni: fix DMA mapping leak on shutdown
  serial: qcom-geni: fix console shutdown hang
  serdev: Set fwnode for serdev devices
  tty: serial: fsl_lpuart: fix race on RX DMA shutdown
  serial: 8250_pci1xxxx: Disable SERIAL_8250_PCI1XXXX config by default
  serial: 8250_fsl: fix handle_irq locking
  serial: 8250_em: Fix UART port type
  serial: 8250: ASPEED_VUART: select REGMAP instead of depending on it
  tty: serial: fsl_lpuart: skip waiting for transmission complete when UARTCTRL_SBK is asserted
  Revert "tty: serial: fsl_lpuart: adjust SERIAL_FSL_LPUART_CONSOLE config dependency"
parents ce86beb4 18365ebf

drivers/tty/serdev/core.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int of_serdev_register_devices(struct serdev_controller *ctrl) 
		if (!serdev)

			continue;



		serdev->dev.of_node = node;

		device_set_node(&serdev->dev, of_fwnode_handle(node));



		err = serdev_device_add(serdev);

		if (err) {

drivers/tty/serial/8250/8250_em.c

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ static int serial8250_em_probe(struct platform_device *pdev) 
	memset(&up, 0, sizeof(up));

	up.port.mapbase = regs->start;

	up.port.irq = irq;

	up.port.type = PORT_UNKNOWN;

	up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP;

	up.port.type = PORT_16750;

	up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE;

	up.port.dev = &pdev->dev;

	up.port.private_data = priv;

drivers/tty/serial/8250/8250_fsl.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int fsl8250_handle_irq(struct uart_port *port) 


	iir = port->serial_in(port, UART_IIR);

	if (iir & UART_IIR_NO_INT) {

		spin_unlock(&up->port.lock);

		spin_unlock_irqrestore(&up->port.lock, flags);

		return 0;

	}
@@ -42,7 +42,7 @@ int fsl8250_handle_irq(struct uart_port *port) 
	if (unlikely(up->lsr_saved_flags & UART_LSR_BI)) {

		up->lsr_saved_flags &= ~UART_LSR_BI;

		port->serial_in(port, UART_RX);

		spin_unlock(&up->port.lock);

		spin_unlock_irqrestore(&up->port.lock, flags);

		return 1;

	}

drivers/tty/serial/8250/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -257,8 +257,9 @@ config SERIAL_8250_ASPEED_VUART 
	tristate "Aspeed Virtual UART"

	depends on SERIAL_8250

	depends on OF

	depends on REGMAP && MFD_SYSCON

	depends on MFD_SYSCON

	depends on ARCH_ASPEED || COMPILE_TEST

	select REGMAP

	help

	  If you want to use the virtual UART (VUART) device on Aspeed

	  BMC platforms, enable this option. This enables the 16550A-
@@ -299,7 +300,6 @@ config SERIAL_8250_PCI1XXXX 
	tristate "Microchip 8250 based serial port"

	depends on SERIAL_8250 && PCI

	select SERIAL_8250_PCILIB

	default SERIAL_8250

	help

	 Select this option if you have a setup with Microchip PCIe

	 Switch with serial port enabled and wish to enable 8250

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ config SERIAL_FSL_LPUART 


config SERIAL_FSL_LPUART_CONSOLE

	bool "Console on Freescale lpuart serial port"

	depends on SERIAL_FSL_LPUART

	depends on SERIAL_FSL_LPUART=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_EARLYCON

	help