Skip to contentSkip to conversation

Further small serial/tty fixups

PATCH New Alan Cox 1 participant 5 messages Jan 27, 2009

Subsystems (2)
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

cover Further small serial/tty fixups

Eric Paris (1):
tty_open can return to userspace holding tty_mutex

Ihar Hrachyshka (1):
MIPS: enable serial UART support on PNX833X devices.

Michael Bramer (1):
Add support for '8-port RS-232 MIC-3620 from advantech'

Uwe Kleine-König (1):
Move jsm_remove_one to .devexit.text

 drivers/char/tty_io.c           |    4 +++-
 drivers/serial/8250_pci.c       |    6 ++++++
 drivers/serial/Kconfig          |    2 +-
 drivers/serial/jsm/jsm_driver.c |    2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
Signature · 7 lines
The early bird who catches the worm works for someone who comes in late
and owns the worm farm.
                -- Travis McGee
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author
#1 lore raw

PATCH 1/4 tty_open can return to userspace holding tty_mutex

From: Eric Paris <[email protected]>

__tty_open could return (to userspace) holding the tty_mutex thanks to a regression introduced by 4a2b5fddd53b80efcb3266ee36e23b8de28e761a. This was found by bisecting an fsfuzzer problem. Admittedly I have no idea how it managed to tickle this 100% reliably, but it is clearly a regression and when hit leaves the box in a completely unusable state. This patch lets the fsfuzzer test complete every time.

---

 drivers/char/tty_io.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/char/tty_io.c +3 -1
index d33e5ab..bc84e12 100644
@@ -1817,8 +1817,10 @@ got_driver:
 		/* check whether we're reopening an existing tty */
 		tty = tty_driver_lookup_tty(driver, inode, index);
 
-		if (IS_ERR(tty))
+		if (IS_ERR(tty)) {
+			mutex_unlock(&tty_mutex);
 			return PTR_ERR(tty);
+		}
 	}
 
 	if (tty) {
author
#2 lore raw

PATCH 2/4 MIPS: enable serial UART support on PNX833X devices.

In reply to Alan Cox

From: Ihar Hrachyshka <[email protected]>

Enabled serial UART driver for PNX833X devices.

---

 drivers/serial/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/Kconfig +1 -1
index 3e525e3..7d7f576 100644
@@ -982,7 +982,7 @@ config SERIAL_SH_SCI_CONSOLE
 
 config SERIAL_PNX8XXX
 	bool "Enable PNX8XXX SoCs' UART Support"
-	depends on MIPS && SOC_PNX8550
+	depends on MIPS && (SOC_PNX8550 || SOC_PNX833X)
 	select SERIAL_CORE
 	help
 	  If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
author
#3 lore raw

PATCH 3/4 Move jsm_remove_one to .devexit.text

In reply to Alan Cox

From: Uwe Kleine-König <[email protected]>

The function jsm_remove_one is used only wrapped by __devexit_p so define it using __devexit.

---

 drivers/serial/jsm/jsm_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/jsm/jsm_driver.c +1 -1
index 338cf8a..92187e2 100644
@@ -180,7 +180,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return rc;
 }
 
-static void jsm_remove_one(struct pci_dev *pdev)
+static void __devexit jsm_remove_one(struct pci_dev *pdev)
 {
 	struct jsm_board *brd = pci_get_drvdata(pdev);
 	int i = 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#4 lore raw

PATCH 4/4 Add support for '8-port RS-232 MIC-3620 from advantech'

In reply to Alan Cox

From: Michael Bramer <[email protected]>

This Patch add the device information for the MIC-3620 8-port RS-232 cPCI card from Advantech Co. Ltd.

---

 drivers/serial/8250_pci.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/serial/8250_pci.c +6 -0
index 2a36712..536d8e5 100644
@@ -806,6 +806,8 @@ pci_default_setup(struct serial_private *priv,
 #define PCI_SUBDEVICE_ID_OCTPRO422	0x0208
 #define PCI_SUBDEVICE_ID_POCTAL232	0x0308
 #define PCI_SUBDEVICE_ID_POCTAL422	0x0408
+#define PCI_VENDOR_ID_ADVANTECH		0x13fe
+#define PCI_DEVICE_ID_ADVANTECH_PCI3620	0x3620
 
 /* Unknown vendors/cards - this should not be in linux/pci_ids.h */
 #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584
@@ -2152,6 +2154,10 @@ static int pciserial_resume_one(struct pci_dev *dev)
 #endif
 
 static struct pci_device_id serial_pci_tbl[] = {
+	/* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */
+	{	PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620,
+		PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0,
+		pbn_b2_8_921600 },
 	{	PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
 		PCI_SUBVENDOR_ID_CONNECT_TECH,
 		PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232, 0, 0,