Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b78de8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver fixes from Greg KH:
 "Here are some tty and serial driver fixes for 3.19-rc5 that resolve
  some reported issues, and add a new device id to the 8250 serial port
  driver.

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

* tag 'tty-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: samsung: Add the support for Exynos5433 SoC
  Revert "tty: Fix pty master poll() after slave closes v2"
  tty: Prevent hw state corruption in exclusive mode reopen
  tty: Add support for the WCH384 4S multi-IO card
  serial: fix parisc boot hang
parents 937102fe 31ec77ac

drivers/tty/n_tty.c

+2 −7
Original line number Diff line number Diff line
@@ -2399,17 +2399,12 @@ static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file, 


	poll_wait(file, &tty->read_wait, wait);

	poll_wait(file, &tty->write_wait, wait);

	if (test_bit(TTY_OTHER_CLOSED, &tty->flags))

		mask |= POLLHUP;

	if (input_available_p(tty, 1))

		mask |= POLLIN | POLLRDNORM;

	else if (mask & POLLHUP) {

		tty_flush_to_ldisc(tty);

	if (input_available_p(tty, 1))

		mask |= POLLIN | POLLRDNORM;

	}

	if (tty->packet && tty->link->ctrl_status)

		mask |= POLLPRI | POLLIN | POLLRDNORM;

	if (test_bit(TTY_OTHER_CLOSED, &tty->flags))

		mask |= POLLHUP;

	if (tty_hung_up_p(file))

		mask |= POLLHUP;

	if (!(mask & (POLLHUP | POLLIN | POLLRDNORM))) {

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

+26 −3
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ pci_wch_ch353_setup(struct serial_private *priv, 
}



static int

pci_wch_ch382_setup(struct serial_private *priv,

pci_wch_ch38x_setup(struct serial_private *priv,

                    const struct pciserial_board *board,

                    struct uart_8250_port *port, int idx)

{
@@ -1880,6 +1880,7 @@ pci_wch_ch382_setup(struct serial_private *priv, 


#define PCIE_VENDOR_ID_WCH		0x1c00

#define PCIE_DEVICE_ID_WCH_CH382_2S1P	0x3250

#define PCIE_DEVICE_ID_WCH_CH384_4S	0x3470



/* Unknown vendors/cards - this should not be in linux/pci_ids.h */

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584
@@ -2571,13 +2572,21 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { 
		.subdevice	= PCI_ANY_ID,

		.setup		= pci_wch_ch353_setup,

	},

	/* WCH CH382 2S1P card (16750 clone) */

	/* WCH CH382 2S1P card (16850 clone) */

	{

		.vendor         = PCIE_VENDOR_ID_WCH,

		.device         = PCIE_DEVICE_ID_WCH_CH382_2S1P,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.setup          = pci_wch_ch382_setup,

		.setup          = pci_wch_ch38x_setup,

	},

	/* WCH CH384 4S card (16850 clone) */

	{

		.vendor         = PCIE_VENDOR_ID_WCH,

		.device         = PCIE_DEVICE_ID_WCH_CH384_4S,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.setup          = pci_wch_ch38x_setup,

	},

	/*

	 * ASIX devices with FIFO bug
@@ -2876,6 +2885,7 @@ enum pci_board_num_t { 
	pbn_fintek_4,

	pbn_fintek_8,

	pbn_fintek_12,

	pbn_wch384_4,

};



/*
@@ -3675,6 +3685,14 @@ static struct pciserial_board pci_boards[] = { 
		.base_baud	= 115200,

		.first_offset	= 0x40,

	},



	[pbn_wch384_4] = {

		.flags		= FL_BASE0,

		.num_ports	= 4,

		.base_baud      = 115200,

		.uart_offset    = 8,

		.first_offset   = 0xC0,

	},

};



static const struct pci_device_id blacklist[] = {
@@ -3687,6 +3705,7 @@ static const struct pci_device_id blacklist[] = { 
	{ PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */

	{ PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */

	{ PCI_DEVICE(0x1c00, 0x3250), }, /* WCH CH382 2S1P */

	{ PCI_DEVICE(0x1c00, 0x3470), }, /* WCH CH384 4S */

};



/*
@@ -5400,6 +5419,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
		PCI_ANY_ID, PCI_ANY_ID,

		0, 0, pbn_b0_bt_2_115200 },



	{	PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_4S,

		PCI_ANY_ID, PCI_ANY_ID,

		0, 0, pbn_wch384_4 },



	/*

	 * Commtech, Inc. Fastcom adapters

	 */

drivers/tty/serial/samsung.c

+36 −20
Original line number Diff line number Diff line
@@ -1757,32 +1757,43 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { 
#endif



#if defined(CONFIG_ARCH_EXYNOS)

#define EXYNOS_COMMON_SERIAL_DRV_DATA				\

	.info = &(struct s3c24xx_uart_info) {			\

		.name		= "Samsung Exynos UART",	\

		.type		= PORT_S3C6400,			\

		.has_divslot	= 1,				\

		.rx_fifomask	= S5PV210_UFSTAT_RXMASK,	\

		.rx_fifoshift	= S5PV210_UFSTAT_RXSHIFT,	\

		.rx_fifofull	= S5PV210_UFSTAT_RXFULL,	\

		.tx_fifofull	= S5PV210_UFSTAT_TXFULL,	\

		.tx_fifomask	= S5PV210_UFSTAT_TXMASK,	\

		.tx_fifoshift	= S5PV210_UFSTAT_TXSHIFT,	\

		.def_clk_sel	= S3C2410_UCON_CLKSEL0,		\

		.num_clks	= 1,				\

		.clksel_mask	= 0,				\

		.clksel_shift	= 0,				\

	},							\

	.def_cfg = &(struct s3c2410_uartcfg) {			\

		.ucon		= S5PV210_UCON_DEFAULT,		\

		.ufcon		= S5PV210_UFCON_DEFAULT,	\

		.has_fracval	= 1,				\

	}							\



static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = {

	.info = &(struct s3c24xx_uart_info) {

		.name		= "Samsung Exynos4 UART",

		.type		= PORT_S3C6400,

		.has_divslot	= 1,

		.rx_fifomask	= S5PV210_UFSTAT_RXMASK,

		.rx_fifoshift	= S5PV210_UFSTAT_RXSHIFT,

		.rx_fifofull	= S5PV210_UFSTAT_RXFULL,

		.tx_fifofull	= S5PV210_UFSTAT_TXFULL,

		.tx_fifomask	= S5PV210_UFSTAT_TXMASK,

		.tx_fifoshift	= S5PV210_UFSTAT_TXSHIFT,

		.def_clk_sel	= S3C2410_UCON_CLKSEL0,

		.num_clks	= 1,

		.clksel_mask	= 0,

		.clksel_shift	= 0,

	},

	.def_cfg = &(struct s3c2410_uartcfg) {

		.ucon		= S5PV210_UCON_DEFAULT,

		.ufcon		= S5PV210_UFCON_DEFAULT,

		.has_fracval	= 1,

	},

	EXYNOS_COMMON_SERIAL_DRV_DATA,

	.fifosize = { 256, 64, 16, 16 },

};



static struct s3c24xx_serial_drv_data exynos5433_serial_drv_data = {

	EXYNOS_COMMON_SERIAL_DRV_DATA,

	.fifosize = { 64, 256, 16, 256 },

};



#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos4210_serial_drv_data)

#define EXYNOS5433_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos5433_serial_drv_data)

#else

#define EXYNOS4210_SERIAL_DRV_DATA (kernel_ulong_t)NULL

#define EXYNOS5433_SERIAL_DRV_DATA (kernel_ulong_t)NULL

#endif



static struct platform_device_id s3c24xx_serial_driver_ids[] = {
@@ -1804,6 +1815,9 @@ static struct platform_device_id s3c24xx_serial_driver_ids[] = { 
	}, {

		.name		= "exynos4210-uart",

		.driver_data	= EXYNOS4210_SERIAL_DRV_DATA,

	}, {

		.name		= "exynos5433-uart",

		.driver_data	= EXYNOS5433_SERIAL_DRV_DATA,

	},

	{ },

};
@@ -1823,6 +1837,8 @@ static const struct of_device_id s3c24xx_uart_dt_match[] = { 
		.data = (void *)S5PV210_SERIAL_DRV_DATA },

	{ .compatible = "samsung,exynos4210-uart",

		.data = (void *)EXYNOS4210_SERIAL_DRV_DATA },

	{ .compatible = "samsung,exynos5433-uart",

		.data = (void *)EXYNOS5433_SERIAL_DRV_DATA },

	{},

};

MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);

drivers/tty/serial/serial_core.c

+3 −1
Original line number Diff line number Diff line
@@ -2164,7 +2164,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port) 
		break;

	}



	dev_info(port->dev, "%s%d at %s (irq = %d, base_baud = %d) is a %s\n",

	printk(KERN_INFO "%s%s%s%d at %s (irq = %d, base_baud = %d) is a %s\n",

	       port->dev ? dev_name(port->dev) : "",

	       port->dev ? ": " : "",

	       drv->dev_name,

	       drv->tty_driver->name_base + port->line,

	       address, port->irq, port->uartclk / 16, uart_type(port));

drivers/tty/tty_io.c

+3 −4
Original line number Diff line number Diff line
@@ -1464,6 +1464,9 @@ static int tty_reopen(struct tty_struct *tty) 
	    driver->subtype == PTY_TYPE_MASTER)

		return -EIO;



	if (test_bit(TTY_EXCLUSIVE, &tty->flags) && !capable(CAP_SYS_ADMIN))

		return -EBUSY;



	tty->count++;



	WARN_ON(!tty->ldisc);
@@ -2106,10 +2109,6 @@ static int tty_open(struct inode *inode, struct file *filp) 
		retval = -ENODEV;

	filp->f_flags = saved_flags;



	if (!retval && test_bit(TTY_EXCLUSIVE, &tty->flags) &&

						!capable(CAP_SYS_ADMIN))

		retval = -EBUSY;



	if (retval) {

#ifdef TTY_DEBUG_HANGUP

		printk(KERN_DEBUG "%s: error %d in opening %s...\n", __func__,