Commit 3837f9a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty / serial driver fixes from Greg KH:
 "Here are some small fixes for reported problems for tty and serial
  drivers for 5.13-rc4.

  They consist of:

   - 8250 bugfixes and new device support

   - lockdown security mode fixup

   - syzbot found problems fixed

   - 8250_omap fix for interrupt storm

   - revert of 8250_omap driver fix as it caused worse problem than the
     original issue

  All but the last patch have been in linux-next for a while, the last
  one is a revert of a problem found in linux-next with the 8250_omap
  driver change"

* tag 'tty-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "serial: 8250: 8250_omap: Fix possible interrupt storm"
  serial: 8250_pci: handle FL_NOIRQ board flag
  serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait'
  serial: 8250_pci: Add support for new HPE serial device
  serial: 8250: 8250_omap: Fix possible interrupt storm
  serial: 8250: Use BIT(x) for UART_{CAP,BUG}_*
  serial: 8250: Add UART_BUG_TXRACE workaround for Aspeed VUART
  serial: 8250_dw: Add device HID for new AMD UART controller
  serial: sh-sci: Fix off-by-one error in FIFO threshold register setting
  serial: core: fix suspicious security_locked_down() call
  serial: tegra: Fix a mask operation that is always true
parents 523d0b1e 56dde68f

drivers/acpi/acpi_apd.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	{ "AMDI0010", APD_ADDR(wt_i2c_desc) },

	{ "AMD0020", APD_ADDR(cz_uart_desc) },

	{ "AMDI0020", APD_ADDR(cz_uart_desc) },

	{ "AMDI0022", APD_ADDR(cz_uart_desc) },

	{ "AMD0030", },

	{ "AMD0040", APD_ADDR(fch_misc_desc)},

	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },

drivers/tty/serial/8250/8250.h

+17 −15
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *  Copyright (C) 2001 Russell King.

 */



#include <linux/bits.h>

#include <linux/serial_8250.h>

#include <linux/serial_reg.h>

#include <linux/dmaengine.h>
@@ -70,24 +71,25 @@ struct serial8250_config { 
	unsigned int	flags;

};



#define UART_CAP_FIFO	(1 << 8)	/* UART has FIFO */

#define UART_CAP_EFR	(1 << 9)	/* UART has EFR */

#define UART_CAP_SLEEP	(1 << 10)	/* UART has IER sleep */

#define UART_CAP_AFE	(1 << 11)	/* MCR-based hw flow control */

#define UART_CAP_UUE	(1 << 12)	/* UART needs IER bit 6 set (Xscale) */

#define UART_CAP_RTOIE	(1 << 13)	/* UART needs IER bit 4 set (Xscale, Tegra) */

#define UART_CAP_HFIFO	(1 << 14)	/* UART has a "hidden" FIFO */

#define UART_CAP_RPM	(1 << 15)	/* Runtime PM is active while idle */

#define UART_CAP_IRDA	(1 << 16)	/* UART supports IrDA line discipline */

#define UART_CAP_MINI	(1 << 17)	/* Mini UART on BCM283X family lacks:

#define UART_CAP_FIFO	BIT(8)	/* UART has FIFO */

#define UART_CAP_EFR	BIT(9)	/* UART has EFR */

#define UART_CAP_SLEEP	BIT(10)	/* UART has IER sleep */

#define UART_CAP_AFE	BIT(11)	/* MCR-based hw flow control */

#define UART_CAP_UUE	BIT(12)	/* UART needs IER bit 6 set (Xscale) */

#define UART_CAP_RTOIE	BIT(13)	/* UART needs IER bit 4 set (Xscale, Tegra) */

#define UART_CAP_HFIFO	BIT(14)	/* UART has a "hidden" FIFO */

#define UART_CAP_RPM	BIT(15)	/* Runtime PM is active while idle */

#define UART_CAP_IRDA	BIT(16)	/* UART supports IrDA line discipline */

#define UART_CAP_MINI	BIT(17)	/* Mini UART on BCM283X family lacks:

					 * STOP PARITY EPAR SPAR WLEN5 WLEN6

					 */



#define UART_BUG_QUOT	(1 << 0)	/* UART has buggy quot LSB */

#define UART_BUG_TXEN	(1 << 1)	/* UART has buggy TX IIR status */

#define UART_BUG_NOMSR	(1 << 2)	/* UART has buggy MSR status bits (Au1x00) */

#define UART_BUG_THRE	(1 << 3)	/* UART has buggy THRE reassertion */

#define UART_BUG_PARITY	(1 << 4)	/* UART mishandles parity if FIFO enabled */

#define UART_BUG_QUOT	BIT(0)	/* UART has buggy quot LSB */

#define UART_BUG_TXEN	BIT(1)	/* UART has buggy TX IIR status */

#define UART_BUG_NOMSR	BIT(2)	/* UART has buggy MSR status bits (Au1x00) */

#define UART_BUG_THRE	BIT(3)	/* UART has buggy THRE reassertion */

#define UART_BUG_PARITY	BIT(4)	/* UART mishandles parity if FIFO enabled */

#define UART_BUG_TXRACE	BIT(5)	/* UART Tx fails to set remote DR */





#ifdef CONFIG_SERIAL_8250_SHARE_IRQ

drivers/tty/serial/8250/8250_aspeed_vuart.c

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ static int aspeed_vuart_probe(struct platform_device *pdev) 
	port.port.status = UPSTAT_SYNC_FIFO;

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

	port.port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);

	port.bugs |= UART_BUG_TXRACE;



	rc = sysfs_create_group(&vuart->dev->kobj, &aspeed_vuart_attr_group);

	if (rc < 0)

drivers/tty/serial/8250/8250_dw.c

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { 
	{ "APMC0D08", 0},

	{ "AMD0020", 0 },

	{ "AMDI0020", 0 },

	{ "AMDI0022", 0 },

	{ "BRCM2032", 0 },

	{ "HISI0031", 0 },

	{ },

drivers/tty/serial/8250/8250_pci.c

+35 −12
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct serial_private { 
	int			line[];

};



#define PCI_DEVICE_ID_HPE_PCI_SERIAL	0x37e



static const struct pci_device_id pci_use_msi[] = {

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,

			 0xA000, 0x1000) },
@@ -63,6 +65,8 @@ static const struct pci_device_id pci_use_msi[] = { 
			 0xA000, 0x1000) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9922,

			 0xA000, 0x1000) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,

			 PCI_ANY_ID, PCI_ANY_ID) },

	{ }

};
@@ -1997,6 +2001,16 @@ static struct pci_serial_quirk pci_serial_quirks[] = { 
		.init		= pci_hp_diva_init,

		.setup		= pci_hp_diva_setup,

	},

	/*

	 * HPE PCI serial device

	 */

	{

		.vendor         = PCI_VENDOR_ID_HP_3PAR,

		.device         = PCI_DEVICE_ID_HPE_PCI_SERIAL,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.setup		= pci_hp_diva_setup,

	},

	/*

	 * Intel

	 */
@@ -3944,6 +3958,9 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) 
	uart.port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;

	uart.port.uartclk = board->base_baud * 16;



	if (board->flags & FL_NOIRQ) {

		uart.port.irq = 0;

	} else {

		if (pci_match_id(pci_use_msi, dev)) {

			dev_dbg(&dev->dev, "Using MSI(-X) interrupts\n");

			pci_set_master(dev);
@@ -3959,6 +3976,8 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) 
		}



		uart.port.irq = pci_irq_vector(dev, 0);

	}



	uart.port.dev = &dev->dev;



	for (i = 0; i < nr_ports; i++) {
@@ -4973,6 +4992,10 @@ static const struct pci_device_id serial_pci_tbl[] = { 
	{	PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b2_1_115200 },

	/* HPE PCI serial device */

	{	PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b1_1_115200 },



	{	PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,