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

Pull tty/serial fixes from Greg KH: "Here are some tty and serial driver fixes for 4.0-rc3. Along with the atime fix that you know about, here are some other serial driver bugfixes as well. Most notable is a wait_until_sent bugfix that was traced back to being around since before 2.6.12 that Johan has fixed up. All have been in linux-next successfully" * tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: TTY: fix tty_wait_until_sent maximum timeout TTY: fix tty_wait_until_sent on 64-bit machines USB: serial: fix infinite wait_until_sent timeout TTY: bfin_jtag_comm: remove incorrect wait_until_sent operation net: irda: fix wait_until_sent poll timeout serial: uapi: Declare all userspace-visible io types serial: core: Fix iotype userspace breakage serial: sprd: Fix missing spin_unlock in sprd_handle_irq() console: Fix console name size mismatch tty: fix up atime/mtime mess, take four serial: 8250_dw: Fix get_mctrl behaviour serial:8250:8250_pci: delete unneeded quirk entries serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S Change email address for 8250_pci serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO" Revert "tty/serial: of_serial: add DT alias ID handling"

Merge tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH: "Here are some tty and serial driver fixes for 4.0-rc3. Along with the atime fix that you know about, here are some other serial driver bugfixes as well. Most notable is a wait_until_sent bugfix that was traced back to being around since before 2.6.12 that Johan has fixed up. All have been in linux-next successfully" * tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: TTY: fix tty_wait_until_sent maximum timeout TTY: fix tty_wait_until_sent on 64-bit machines USB: serial: fix infinite wait_until_sent timeout TTY: bfin_jtag_comm: remove incorrect wait_until_sent operation net: irda: fix wait_until_sent poll timeout serial: uapi: Declare all userspace-visible io types serial: core: Fix iotype userspace breakage serial: sprd: Fix missing spin_unlock in sprd_handle_irq() console: Fix console name size mismatch tty: fix up atime/mtime mess, take four serial: 8250_dw: Fix get_mctrl behaviour serial:8250:8250_pci: delete unneeded quirk entries serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S Change email address for 8250_pci serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO" Revert "tty/serial: of_serial: add DT alias ID handling"
Linus Torvalds
2 parents 47df986b68 c37bc682e3
Showing 15 changed files Side-by-side Diff
Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt
drivers/tty/bfin_jtag_comm.c
drivers/tty/serial/8250/8250_core.c
drivers/tty/serial/8250/8250_dw.c
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/of_serial.c
drivers/tty/serial/sprd_serial.c
drivers/tty/tty_io.c
drivers/tty/tty_ioctl.c
drivers/usb/serial/generic.c
include/linux/serial_core.h
include/uapi/linux/serial.h
kernel/printk/console_cmdline.h
kernel/printk/printk.c
net/irda/ircomm/ircomm_tty.c
@@ -21,6 +21,18 @@
 - reg-io-width : the size (in bytes) of the IO accesses that should be
   performed on the device.  If this property is not present then single byte
   accesses are used.
+- dcd-override : Override the DCD modem status signal. This signal will always
+  be reported as active instead of being obtained from the modem status
+  register. Define this if your serial port does not use this pin.
+- dsr-override : Override the DTS modem status signal. This signal will always
+  be reported as active instead of being obtained from the modem status
+  register. Define this if your serial port does not use this pin.
+- cts-override : Override the CTS modem status signal. This signal will always
+  be reported as active instead of being obtained from the modem status
+  register. Define this if your serial port does not use this pin.
+- ri-override : Override the RI modem status signal. This signal will always be
+  reported as inactive instead of being obtained from the modem status register.
+  Define this if your serial port does not use this pin.
  
 Example:
  
@@ -31,6 +43,10 @@
 		interrupts = <10>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		dcd-override;
+		dsr-override;
+		cts-override;
+		ri-override;
 	};
  
 Example with one clock:
@@ -210,18 +210,6 @@
 	return circ_cnt(&bfin_jc_write_buf);
 }
  
-static void
-bfin_jc_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-	unsigned long expire = jiffies + timeout;
-	while (!circ_empty(&bfin_jc_write_buf)) {
-		if (signal_pending(current))
-			break;
-		if (time_after(jiffies, expire))
-			break;
-	}
-}
-
 static const struct tty_operations bfin_jc_ops = {
 	.open            = bfin_jc_open,
 	.close           = bfin_jc_close,
@@ -230,7 +218,6 @@
 	.flush_chars     = bfin_jc_flush_chars,
 	.write_room      = bfin_jc_write_room,
 	.chars_in_buffer = bfin_jc_chars_in_buffer,
-	.wait_until_sent = bfin_jc_wait_until_sent,
 };
  
 static int __init bfin_jc_init(void)
@@ -2138,8 +2138,8 @@
 	/*
 	 * Clear the interrupt registers.
 	 */
-	if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
-		serial_port_in(port, UART_RX);
+	serial_port_in(port, UART_LSR);
+	serial_port_in(port, UART_RX);
 	serial_port_in(port, UART_IIR);
 	serial_port_in(port, UART_MSR);
  
@@ -2300,8 +2300,8 @@
 	 * saved flags to avoid getting false values from polling
 	 * routines or the previous session.
 	 */
-	if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
-		serial_port_in(port, UART_RX);
+	serial_port_in(port, UART_LSR);
+	serial_port_in(port, UART_RX);
 	serial_port_in(port, UART_IIR);
 	serial_port_in(port, UART_MSR);
 	up->lsr_saved_flags = 0;
@@ -2394,8 +2394,7 @@
 	 * Read data port to reset things, and then unlink from
 	 * the IRQ chain.
 	 */
-	if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
-		serial_port_in(port, UART_RX);
+	serial_port_in(port, UART_RX);
 	serial8250_rpm_put(up);
  
 	del_timer_sync(&up->timer);
@@ -59,6 +59,8 @@
 	u8			usr_reg;
 	int			last_mcr;
 	int			line;
+	int			msr_mask_on;
+	int			msr_mask_off;
 	struct clk		*clk;
 	struct clk		*pclk;
 	struct reset_control	*rst;
@@ -81,6 +83,12 @@
 		value &= ~UART_MSR_DCTS;
 	}
  
+	/* Override any modem control signals if needed */
+	if (offset == UART_MSR) {
+		value |= d->msr_mask_on;
+		value &= ~d->msr_mask_off;
+	}
+
 	return value;
 }
  
@@ -333,6 +341,30 @@
 	id = of_alias_get_id(np, "serial");
 	if (id >= 0)
 		p->line = id;
+
+	if (of_property_read_bool(np, "dcd-override")) {
+		/* Always report DCD as active */
+		data->msr_mask_on |= UART_MSR_DCD;
+		data->msr_mask_off |= UART_MSR_DDCD;
+	}
+
+	if (of_property_read_bool(np, "dsr-override")) {
+		/* Always report DSR as active */
+		data->msr_mask_on |= UART_MSR_DSR;
+		data->msr_mask_off |= UART_MSR_DDSR;
+	}
+
+	if (of_property_read_bool(np, "cts-override")) {
+		/* Always report DSR as active */
+		data->msr_mask_on |= UART_MSR_DSR;
+		data->msr_mask_off |= UART_MSR_DDSR;
+	}
+
+	if (of_property_read_bool(np, "ri-override")) {
+		/* Always report Ring indicator as inactive */
+		data->msr_mask_off |= UART_MSR_RI;
+		data->msr_mask_off |= UART_MSR_TERI;
+	}
  
 	/* clock got configured through clk api, all done */
 	if (p->uartclk)
@@ -69,7 +69,7 @@
 	       "Please send the output of lspci -vv, this\n"
 	       "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n"
 	       "manufacturer and name of serial board or\n"
-	       "modem board to rmk+serial@arm.linux.org.uk.\n",
+	       "modem board to <linux-serial@vger.kernel.org>.\n",
 	       pci_name(dev), str, dev->vendor, dev->device,
 	       dev->subsystem_vendor, dev->subsystem_device);
 }
@@ -1989,13 +1989,6 @@
 	},
 	{
 		.vendor		= PCI_VENDOR_ID_INTEL,
-		.device		= PCI_DEVICE_ID_INTEL_QRK_UART,
-		.subvendor	= PCI_ANY_ID,
-		.subdevice	= PCI_ANY_ID,
-		.setup		= pci_default_setup,
-	},
-	{
-		.vendor		= PCI_VENDOR_ID_INTEL,
 		.device		= PCI_DEVICE_ID_INTEL_BSW_UART1,
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
@@ -2201,13 +2194,6 @@
 	 */
 	{
 		.vendor		= PCI_VENDOR_ID_PLX,
-		.device		= PCI_DEVICE_ID_PLX_9030,
-		.subvendor	= PCI_SUBVENDOR_ID_PERLE,
-		.subdevice	= PCI_ANY_ID,
-		.setup		= pci_default_setup,
-	},
-	{
-		.vendor		= PCI_VENDOR_ID_PLX,
 		.device		= PCI_DEVICE_ID_PLX_9050,
 		.subvendor	= PCI_SUBVENDOR_ID_EXSYS,
 		.subdevice	= PCI_SUBDEVICE_ID_EXSYS_4055,
@@ -5412,10 +5398,6 @@
 		0, 0, pbn_b0_bt_4_115200 },
  
 	{	PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_2S1PF,
-		PCI_ANY_ID, PCI_ANY_ID,
-		0, 0, pbn_b0_bt_2_115200 },
-
-	{	PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH352_2S,
 		PCI_ANY_ID, PCI_ANY_ID,
 		0, 0, pbn_b0_bt_2_115200 },
  
@@ -133,10 +133,6 @@
 	if (of_find_property(np, "no-loopback-test", NULL))
 		port->flags |= UPF_SKIP_TEST;
  
-	ret = of_alias_get_id(np, "serial");
-	if (ret >= 0)
-		port->line = ret;
-
 	port->dev = &ofdev->dev;
  
 	switch (type) {
@@ -293,8 +293,10 @@
  
 	ims = serial_in(port, SPRD_IMSR);
  
-	if (!ims)
+	if (!ims) {
+		spin_unlock(&port->lock);
 		return IRQ_NONE;
+	}
  
 	serial_out(port, SPRD_ICLR, ~0);
  
@@ -1028,8 +1028,8 @@
 /* We limit tty time update visibility to every 8 seconds or so. */
 static void tty_update_time(struct timespec *time)
 {
-	unsigned long sec = get_seconds() & ~7;
-	if ((long)(sec - time->tv_sec) > 0)
+	unsigned long sec = get_seconds();
+	if (abs(sec - time->tv_sec) & ~7)
 		time->tv_sec = sec;
 }
  
@@ -217,11 +217,17 @@
 #endif
 	if (!timeout)
 		timeout = MAX_SCHEDULE_TIMEOUT;
-	if (wait_event_interruptible_timeout(tty->write_wait,
-			!tty_chars_in_buffer(tty), timeout) >= 0) {
-		if (tty->ops->wait_until_sent)
-			tty->ops->wait_until_sent(tty, timeout);
-	}
+
+	timeout = wait_event_interruptible_timeout(tty->write_wait,
+			!tty_chars_in_buffer(tty), timeout);
+	if (timeout <= 0)
+		return;
+
+	if (timeout == MAX_SCHEDULE_TIMEOUT)
+		timeout = 0;
+
+	if (tty->ops->wait_until_sent)
+		tty->ops->wait_until_sent(tty, timeout);
 }
 EXPORT_SYMBOL(tty_wait_until_sent);
  
@@ -258,7 +258,8 @@
 	 * character or at least one jiffy.
 	 */
 	period = max_t(unsigned long, (10 * HZ / bps), 1);
-	period = min_t(unsigned long, period, timeout);
+	if (timeout)
+		period = min_t(unsigned long, period, timeout);
  
 	dev_dbg(&port->dev, "%s - timeout = %u ms, period = %u ms\n",
 					__func__, jiffies_to_msecs(timeout),
@@ -268,7 +269,7 @@
 		schedule_timeout_interruptible(period);
 		if (signal_pending(current))
 			break;
-		if (time_after(jiffies, expire))
+		if (timeout && time_after(jiffies, expire))
 			break;
 	}
 }
@@ -143,13 +143,13 @@
 	unsigned char		iotype;			/* io access style */
 	unsigned char		unused1;
  
-#define UPIO_PORT		(0)			/* 8b I/O port access */
-#define UPIO_HUB6		(1)			/* Hub6 ISA card */
-#define UPIO_MEM		(2)			/* 8b MMIO access */
-#define UPIO_MEM32		(3)			/* 32b little endian */
-#define UPIO_MEM32BE		(4)			/* 32b big endian */
-#define UPIO_AU			(5)			/* Au1x00 and RT288x type IO */
-#define UPIO_TSI		(6)			/* Tsi108/109 type IO */
+#define UPIO_PORT		(SERIAL_IO_PORT)	/* 8b I/O port access */
+#define UPIO_HUB6		(SERIAL_IO_HUB6)	/* Hub6 ISA card */
+#define UPIO_MEM		(SERIAL_IO_MEM)		/* 8b MMIO access */
+#define UPIO_MEM32		(SERIAL_IO_MEM32)	/* 32b little endian */
+#define UPIO_AU			(SERIAL_IO_AU)		/* Au1x00 and RT288x type IO */
+#define UPIO_TSI		(SERIAL_IO_TSI)		/* Tsi108/109 type IO */
+#define UPIO_MEM32BE		(SERIAL_IO_MEM32BE)	/* 32b big endian */
  
 	unsigned int		read_status_mask;	/* driver specific */
 	unsigned int		ignore_status_mask;	/* driver specific */
@@ -65,6 +65,10 @@
 #define SERIAL_IO_PORT	0
 #define SERIAL_IO_HUB6	1
 #define SERIAL_IO_MEM	2
+#define SERIAL_IO_MEM32	  3
+#define SERIAL_IO_AU	  4
+#define SERIAL_IO_TSI	  5
+#define SERIAL_IO_MEM32BE 6
  
 #define UART_CLEAR_FIFO		0x01
 #define UART_USE_FIFO		0x02
@@ -3,7 +3,7 @@
  
 struct console_cmdline
 {
-	char	name[8];			/* Name of the driver	    */
+	char	name[16];			/* Name of the driver	    */
 	int	index;				/* Minor dev. to use	    */
 	char	*options;			/* Options for the driver   */
 #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
@@ -2464,6 +2464,7 @@
 	for (i = 0, c = console_cmdline;
 	     i < MAX_CMDLINECONSOLES && c->name[0];
 	     i++, c++) {
+		BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
 		if (strcmp(c->name, newcon->name) != 0)
 			continue;
 		if (newcon->index >= 0 &&
@@ -798,7 +798,9 @@
 	orig_jiffies = jiffies;
  
 	/* Set poll time to 200 ms */
-	poll_time = IRDA_MIN(timeout, msecs_to_jiffies(200));
+	poll_time = msecs_to_jiffies(200);
+	if (timeout)
+		poll_time = min_t(unsigned long, timeout, poll_time);
  
 	spin_lock_irqsave(&self->spinlock, flags);
 	while (self->tx_skb && self->tx_skb->len) {
...	...	@@ -21,6 +21,18 @@
21	21	- reg-io-width : the size (in bytes) of the IO accesses that should be
22	22	performed on the device. If this property is not present then single byte
23	23	accesses are used.
	24	+- dcd-override : Override the DCD modem status signal. This signal will always
	25	+ be reported as active instead of being obtained from the modem status
	26	+ register. Define this if your serial port does not use this pin.
	27	+- dsr-override : Override the DTS modem status signal. This signal will always
	28	+ be reported as active instead of being obtained from the modem status
	29	+ register. Define this if your serial port does not use this pin.
	30	+- cts-override : Override the CTS modem status signal. This signal will always
	31	+ be reported as active instead of being obtained from the modem status
	32	+ register. Define this if your serial port does not use this pin.
	33	+- ri-override : Override the RI modem status signal. This signal will always be
	34	+ reported as inactive instead of being obtained from the modem status register.
	35	+ Define this if your serial port does not use this pin.
24	36
25	37	Example:
26	38
...	...	@@ -31,6 +43,10 @@
31	43	interrupts = <10>;
32	44	reg-shift = <2>;
33	45	reg-io-width = <4>;
	46	+ dcd-override;
	47	+ dsr-override;
	48	+ cts-override;
	49	+ ri-override;
34	50	};
35	51
36	52	Example with one clock:
...	...	@@ -210,18 +210,6 @@
210	210	return circ_cnt(&bfin_jc_write_buf);
211	211	}
212	212
213		-static void
214		-bfin_jc_wait_until_sent(struct tty_struct *tty, int timeout)
215		-{
216		- unsigned long expire = jiffies + timeout;
217		- while (!circ_empty(&bfin_jc_write_buf)) {
218		- if (signal_pending(current))
219		- break;
220		- if (time_after(jiffies, expire))
221		- break;
222		- }
223		-}
224		-
225	213	static const struct tty_operations bfin_jc_ops = {
226	214	.open = bfin_jc_open,
227	215	.close = bfin_jc_close,
...	...	@@ -230,7 +218,6 @@
230	218	.flush_chars = bfin_jc_flush_chars,
231	219	.write_room = bfin_jc_write_room,
232	220	.chars_in_buffer = bfin_jc_chars_in_buffer,
233		- .wait_until_sent = bfin_jc_wait_until_sent,
234	221	};
235	222
236	223	static int __init bfin_jc_init(void)
...	...	@@ -2138,8 +2138,8 @@
2138	2138	/*
2139	2139	* Clear the interrupt registers.
2140	2140	*/
2141		- if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
2142		- serial_port_in(port, UART_RX);
	2141	+ serial_port_in(port, UART_LSR);
	2142	+ serial_port_in(port, UART_RX);
2143	2143	serial_port_in(port, UART_IIR);
2144	2144	serial_port_in(port, UART_MSR);
2145	2145
...	...	@@ -2300,8 +2300,8 @@
2300	2300	* saved flags to avoid getting false values from polling
2301	2301	* routines or the previous session.
2302	2302	*/
2303		- if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
2304		- serial_port_in(port, UART_RX);
	2303	+ serial_port_in(port, UART_LSR);
	2304	+ serial_port_in(port, UART_RX);
2305	2305	serial_port_in(port, UART_IIR);
2306	2306	serial_port_in(port, UART_MSR);
2307	2307	up->lsr_saved_flags = 0;
...	...	@@ -2394,8 +2394,7 @@
2394	2394	* Read data port to reset things, and then unlink from
2395	2395	* the IRQ chain.
2396	2396	*/
2397		- if (serial_port_in(port, UART_LSR) & UART_LSR_DR)
2398		- serial_port_in(port, UART_RX);
	2397	+ serial_port_in(port, UART_RX);
2399	2398	serial8250_rpm_put(up);
2400	2399
2401	2400	del_timer_sync(&up->timer);
...	...	@@ -59,6 +59,8 @@
59	59	u8 usr_reg;
60	60	int last_mcr;
61	61	int line;
	62	+ int msr_mask_on;
	63	+ int msr_mask_off;
62	64	struct clk *clk;
63	65	struct clk *pclk;
64	66	struct reset_control *rst;
...	...	@@ -81,6 +83,12 @@
81	83	value &= ~UART_MSR_DCTS;
82	84	}
83	85
	86	+ /* Override any modem control signals if needed */
	87	+ if (offset == UART_MSR) {
	88	+ value \|= d->msr_mask_on;
	89	+ value &= ~d->msr_mask_off;
	90	+ }
	91	+
84	92	return value;
85	93	}
86	94
...	...	@@ -333,6 +341,30 @@
333	341	id = of_alias_get_id(np, "serial");
334	342	if (id >= 0)
335	343	p->line = id;
	344	+
	345	+ if (of_property_read_bool(np, "dcd-override")) {
	346	+ /* Always report DCD as active */
	347	+ data->msr_mask_on \|= UART_MSR_DCD;
	348	+ data->msr_mask_off \|= UART_MSR_DDCD;
	349	+ }
	350	+
	351	+ if (of_property_read_bool(np, "dsr-override")) {
	352	+ /* Always report DSR as active */
	353	+ data->msr_mask_on \|= UART_MSR_DSR;
	354	+ data->msr_mask_off \|= UART_MSR_DDSR;
	355	+ }
	356	+
	357	+ if (of_property_read_bool(np, "cts-override")) {
	358	+ /* Always report DSR as active */
	359	+ data->msr_mask_on \|= UART_MSR_DSR;
	360	+ data->msr_mask_off \|= UART_MSR_DDSR;
	361	+ }
	362	+
	363	+ if (of_property_read_bool(np, "ri-override")) {
	364	+ /* Always report Ring indicator as inactive */
	365	+ data->msr_mask_off \|= UART_MSR_RI;
	366	+ data->msr_mask_off \|= UART_MSR_TERI;
	367	+ }
336	368
337	369	/* clock got configured through clk api, all done */
338	370	if (p->uartclk)
...	...	@@ -69,7 +69,7 @@
69	69	"Please send the output of lspci -vv, this\n"
70	70	"message (0x%04x,0x%04x,0x%04x,0x%04x), the\n"
71	71	"manufacturer and name of serial board or\n"
72		- "modem board to rmk+serial@arm.linux.org.uk.\n",
	72	+ "modem board to <linux-serial@vger.kernel.org>.\n",
73	73	pci_name(dev), str, dev->vendor, dev->device,
74	74	dev->subsystem_vendor, dev->subsystem_device);
75	75	}
...	...	@@ -1989,13 +1989,6 @@
1989	1989	},
1990	1990	{
1991	1991	.vendor = PCI_VENDOR_ID_INTEL,
1992		- .device = PCI_DEVICE_ID_INTEL_QRK_UART,
1993		- .subvendor = PCI_ANY_ID,
1994		- .subdevice = PCI_ANY_ID,
1995		- .setup = pci_default_setup,
1996		- },
1997		- {
1998		- .vendor = PCI_VENDOR_ID_INTEL,
1999	1992	.device = PCI_DEVICE_ID_INTEL_BSW_UART1,
2000	1993	.subvendor = PCI_ANY_ID,
2001	1994	.subdevice = PCI_ANY_ID,
...	...	@@ -2201,13 +2194,6 @@
2201	2194	*/
2202	2195	{
2203	2196	.vendor = PCI_VENDOR_ID_PLX,
2204		- .device = PCI_DEVICE_ID_PLX_9030,
2205		- .subvendor = PCI_SUBVENDOR_ID_PERLE,
2206		- .subdevice = PCI_ANY_ID,
2207		- .setup = pci_default_setup,
2208		- },
2209		- {
2210		- .vendor = PCI_VENDOR_ID_PLX,
2211	2197	.device = PCI_DEVICE_ID_PLX_9050,
2212	2198	.subvendor = PCI_SUBVENDOR_ID_EXSYS,
2213	2199	.subdevice = PCI_SUBDEVICE_ID_EXSYS_4055,
...	...	@@ -5412,10 +5398,6 @@
5412	5398	0, 0, pbn_b0_bt_4_115200 },
5413	5399
5414	5400	{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_2S1PF,
5415		- PCI_ANY_ID, PCI_ANY_ID,
5416		- 0, 0, pbn_b0_bt_2_115200 },
5417		-
5418		- { PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH352_2S,
5419	5401	PCI_ANY_ID, PCI_ANY_ID,
5420	5402	0, 0, pbn_b0_bt_2_115200 },
5421	5403
...	...	@@ -133,10 +133,6 @@
133	133	if (of_find_property(np, "no-loopback-test", NULL))
134	134	port->flags \|= UPF_SKIP_TEST;
135	135
136		- ret = of_alias_get_id(np, "serial");
137		- if (ret >= 0)
138		- port->line = ret;
139		-
140	136	port->dev = &ofdev->dev;
141	137
142	138	switch (type) {
...	...	@@ -293,8 +293,10 @@
293	293
294	294	ims = serial_in(port, SPRD_IMSR);
295	295
296		- if (!ims)
	296	+ if (!ims) {
	297	+ spin_unlock(&port->lock);
297	298	return IRQ_NONE;
	299	+ }
298	300
299	301	serial_out(port, SPRD_ICLR, ~0);
300	302
...	...	@@ -1028,8 +1028,8 @@
1028	1028	/* We limit tty time update visibility to every 8 seconds or so. */
1029	1029	static void tty_update_time(struct timespec *time)
1030	1030	{
1031		- unsigned long sec = get_seconds() & ~7;
1032		- if ((long)(sec - time->tv_sec) > 0)
	1031	+ unsigned long sec = get_seconds();
	1032	+ if (abs(sec - time->tv_sec) & ~7)
1033	1033	time->tv_sec = sec;
1034	1034	}
1035	1035
...	...	@@ -217,11 +217,17 @@
217	217	#endif
218	218	if (!timeout)
219	219	timeout = MAX_SCHEDULE_TIMEOUT;
220		- if (wait_event_interruptible_timeout(tty->write_wait,
221		- !tty_chars_in_buffer(tty), timeout) >= 0) {
222		- if (tty->ops->wait_until_sent)
223		- tty->ops->wait_until_sent(tty, timeout);
224		- }
	220	+
	221	+ timeout = wait_event_interruptible_timeout(tty->write_wait,
	222	+ !tty_chars_in_buffer(tty), timeout);
	223	+ if (timeout <= 0)
	224	+ return;
	225	+
	226	+ if (timeout == MAX_SCHEDULE_TIMEOUT)
	227	+ timeout = 0;
	228	+
	229	+ if (tty->ops->wait_until_sent)
	230	+ tty->ops->wait_until_sent(tty, timeout);
225	231	}
226	232	EXPORT_SYMBOL(tty_wait_until_sent);
227	233
...	...	@@ -258,7 +258,8 @@
258	258	* character or at least one jiffy.
259	259	*/
260	260	period = max_t(unsigned long, (10 * HZ / bps), 1);
261		- period = min_t(unsigned long, period, timeout);
	261	+ if (timeout)
	262	+ period = min_t(unsigned long, period, timeout);
262	263
263	264	dev_dbg(&port->dev, "%s - timeout = %u ms, period = %u ms\n",
264	265	__func__, jiffies_to_msecs(timeout),
...	...	@@ -268,7 +269,7 @@
268	269	schedule_timeout_interruptible(period);
269	270	if (signal_pending(current))
270	271	break;
271		- if (time_after(jiffies, expire))
	272	+ if (timeout && time_after(jiffies, expire))
272	273	break;
273	274	}
274	275	}