Skip to contentSkip to conversation

8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card

PATCH In review Ira W. Snyder 2 participants 3 messages Dec 4, 2009 – Dec 16, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card

This patch is heavily based on an earlier patch found on the linux-serial mailing list [1], written by Darius Augulis.

The previous incarnation of this patch only supported a 2x serial port card. I have added support for my SYBA 6x serial port card, and tested on x86.

[1]: http://marc.info/?l=linux-serial&m=124975806304760

---

According to MAINTAINERS the 8250/16550 support currently lacks a maintainer. The earlier incarnation of this patch was posted all the way back in August.

If necessary, I can post an incremental patch from the Darius' earlier patch. It would be great if someone could pick it up. I hate when new hardware doesn't work, especially something as simple as this.

 drivers/parport/parport_pc.c |    6 ++++++
 drivers/serial/8250_pci.c    |   22 +++++++++++++++++++++-
 include/linux/pci_ids.h      |    1 +
 3 files changed, 28 insertions(+), 1 deletions(-)
drivers/parport/parport_pc.c +6 -0
index 2597145..85204f0 100644
@@ -2908,6 +2908,7 @@ enum parport_pc_pci_cards {
 	netmos_9805,
 	netmos_9815,
 	netmos_9901,
+	netmos_9865,
 	quatech_sppxp100,
 };
 
@@ -2989,6 +2990,7 @@ static struct parport_pc_pci {
 	/* netmos_9805 */               { 1, { { 0, -1 }, } },
 	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } },
 	/* netmos_9901 */               { 1, { { 0, -1 }, } },
+	/* netmos_9865 */               { 1, { { 0, -1 }, } },
 	/* quatech_sppxp100 */		{ 1, { { 0, 1 }, } },
 };
 
@@ -3092,6 +3094,10 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
 	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
 	  0xA000, 0x2000, 0, 0, netmos_9901 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x1000, 0, 0, netmos_9865 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x2000, 0, 0, netmos_9865 },
 	/* Quatech SPPXP-100 Parallel port PCI ExpressCard */
 	{ PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
drivers/serial/8250_pci.c +21 -1
index b28af13..8b18c3c 100644
@@ -760,7 +760,8 @@ static int pci_netmos_init(struct pci_dev *dev)
 	/* subdevice 0x00PS means <P> parallel, <S> serial */
 	unsigned int num_serial = dev->subsystem_device & 0xf;
 
-	if (dev->device == PCI_DEVICE_ID_NETMOS_9901)
+	if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
+		(dev->device == PCI_DEVICE_ID_NETMOS_9865))
 		return 0;
 	if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
 			dev->subsystem_device == 0x0299)
@@ -1479,6 +1480,7 @@ enum pci_board_num_t {
 
 	pbn_b0_bt_1_115200,
 	pbn_b0_bt_2_115200,
+	pbn_b0_bt_4_115200,
 	pbn_b0_bt_8_115200,
 
 	pbn_b0_bt_1_460800,
@@ -1703,6 +1705,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
 		.base_baud	= 115200,
 		.uart_offset	= 8,
 	},
+	[pbn_b0_bt_4_115200] = {
+		.flags		= FL_BASE0|FL_BASE_BARS,
+		.num_ports	= 4,
+		.base_baud	= 115200,
+		.uart_offset	= 8,
+	},
 	[pbn_b0_bt_8_115200] = {
 		.flags		= FL_BASE0|FL_BASE_BARS,
 		.num_ports	= 8,
@@ -3649,6 +3657,18 @@ static struct pci_device_id serial_pci_tbl[] = {
 		0, 0, pbn_b0_1_115200 },
 
 	/*
+	 * Best Connectivity PCI Multi I/O cards
+	 */
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x1000,
+		0, 0, pbn_b0_1_115200 },
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x3004,
+		0, 0, pbn_b0_bt_4_115200 },
+
+	/*
 	 * These entries match devices with class COMMUNICATION_SERIAL,
 	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
 	 */
include/linux/pci_ids.h +1 -0
index 84cf1f3..b2c0bf3 100644
@@ -2675,6 +2675,7 @@
 #define PCI_DEVICE_ID_NETMOS_9835	0x9835
 #define PCI_DEVICE_ID_NETMOS_9845	0x9845
 #define PCI_DEVICE_ID_NETMOS_9855	0x9855
+#define PCI_DEVICE_ID_NETMOS_9865	0x9865
 #define PCI_DEVICE_ID_NETMOS_9901	0x9901
 
 #define PCI_VENDOR_ID_3COM_2		0xa727
Signature · 1 line
1.5.4.3
#1 lore raw

hi community!

can anybody ack this simple patch and merge it to 2.6.33-rc1 ? I still waiting for this half year!

Darius A.

Quoted 124 lines · Ira W. Snyder

This patch is heavily based on an earlier patch found on the linux-serial mailing list [1], written by Darius Augulis.

The previous incarnation of this patch only supported a 2x serial port card. I have added support for my SYBA 6x serial port card, and tested on x86.

[1]: http://marc.info/?l=linux-serial&m=124975806304760

---

According to MAINTAINERS the 8250/16550 support currently lacks a maintainer. The earlier incarnation of this patch was posted all the way back in August.

If necessary, I can post an incremental patch from the Darius' earlier patch. It would be great if someone could pick it up. I hate when new hardware doesn't work, especially something as simple as this.

  drivers/parport/parport_pc.c |    6 ++++++
  drivers/serial/8250_pci.c    |   22 +++++++++++++++++++++-
  include/linux/pci_ids.h      |    1 +
  3 files changed, 28 insertions(+), 1 deletions(-)
drivers/parport/parport_pc.c +6 -0
index 2597145..85204f0 100644
@@ -2908,6 +2908,7 @@ enum parport_pc_pci_cards {
  	netmos_9805,
  	netmos_9815,
  	netmos_9901,
+	netmos_9865,
  	quatech_sppxp100,
  };
 
@@ -2989,6 +2990,7 @@ static struct parport_pc_pci {
  	/* netmos_9805 */               { 1, { { 0, -1 }, } },
  	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } },
  	/* netmos_9901 */               { 1, { { 0, -1 }, } },
+	/* netmos_9865 */               { 1, { { 0, -1 }, } },
  	/* quatech_sppxp100 */		{ 1, { { 0, 1 }, } },
  };
 
@@ -3092,6 +3094,10 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
  	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
  	  0xA000, 0x2000, 0, 0, netmos_9901 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x1000, 0, 0, netmos_9865 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x2000, 0, 0, netmos_9865 },
  	/* Quatech SPPXP-100 Parallel port PCI ExpressCard */
  	{ PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100,
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
drivers/serial/8250_pci.c +21 -1
index b28af13..8b18c3c 100644
@@ -760,7 +760,8 @@ static int pci_netmos_init(struct pci_dev *dev)
  	/* subdevice 0x00PS means<P>  parallel,<S>  serial */
  	unsigned int num_serial = dev->subsystem_device&  0xf;
 
-	if (dev->device == PCI_DEVICE_ID_NETMOS_9901)
+	if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
+		(dev->device == PCI_DEVICE_ID_NETMOS_9865))
  		return 0;
  	if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM&&
  			dev->subsystem_device == 0x0299)
@@ -1479,6 +1480,7 @@ enum pci_board_num_t {
 
  	pbn_b0_bt_1_115200,
  	pbn_b0_bt_2_115200,
+	pbn_b0_bt_4_115200,
  	pbn_b0_bt_8_115200,
 
  	pbn_b0_bt_1_460800,
@@ -1703,6 +1705,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
  		.base_baud	= 115200,
  		.uart_offset	= 8,
  	},
+	[pbn_b0_bt_4_115200] = {
+		.flags		= FL_BASE0|FL_BASE_BARS,
+		.num_ports	= 4,
+		.base_baud	= 115200,
+		.uart_offset	= 8,
+	},
  	[pbn_b0_bt_8_115200] = {
  		.flags		= FL_BASE0|FL_BASE_BARS,
  		.num_ports	= 8,
@@ -3649,6 +3657,18 @@ static struct pci_device_id serial_pci_tbl[] = {
  		0, 0, pbn_b0_1_115200 },
 
  	/*
+	 * Best Connectivity PCI Multi I/O cards
+	 */
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x1000,
+		0, 0, pbn_b0_1_115200 },
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x3004,
+		0, 0, pbn_b0_bt_4_115200 },
+
+	/*
  	 * These entries match devices with class COMMUNICATION_SERIAL,
  	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
  	 */
include/linux/pci_ids.h +1 -0
index 84cf1f3..b2c0bf3 100644
@@ -2675,6 +2675,7 @@
  #define PCI_DEVICE_ID_NETMOS_9835	0x9835
  #define PCI_DEVICE_ID_NETMOS_9845	0x9845
  #define PCI_DEVICE_ID_NETMOS_9855	0x9855
+#define PCI_DEVICE_ID_NETMOS_9865	0x9865
  #define PCI_DEVICE_ID_NETMOS_9901	0x9901
 
  #define PCI_VENDOR_ID_3COM_2		0xa727
#2 lore raw
Quoted 5 lines · Darius Augulis

hi community!

can anybody ack this simple patch and merge it to 2.6.33-rc1 ? I still waiting for this half year!

Perhaps AKPM can pick this up and add it to -mm. I've had him pick up similar patches from me before. I've added him to the CC list.

Ira

Quoted 126 lines · Ira W. Snyder
Quoted 124 lines

This patch is heavily based on an earlier patch found on the linux-serial mailing list [1], written by Darius Augulis.

The previous incarnation of this patch only supported a 2x serial port card. I have added support for my SYBA 6x serial port card, and tested on x86.

[1]: http://marc.info/?l=linux-serial&m=124975806304760

---

According to MAINTAINERS the 8250/16550 support currently lacks a maintainer. The earlier incarnation of this patch was posted all the way back in August.

If necessary, I can post an incremental patch from the Darius' earlier patch. It would be great if someone could pick it up. I hate when new hardware doesn't work, especially something as simple as this.

  drivers/parport/parport_pc.c |    6 ++++++
  drivers/serial/8250_pci.c    |   22 +++++++++++++++++++++-
  include/linux/pci_ids.h      |    1 +
  3 files changed, 28 insertions(+), 1 deletions(-)
drivers/parport/parport_pc.c +6 -0
index 2597145..85204f0 100644
@@ -2908,6 +2908,7 @@ enum parport_pc_pci_cards {
  	netmos_9805,
  	netmos_9815,
  	netmos_9901,
+	netmos_9865,
  	quatech_sppxp100,
  };
 
@@ -2989,6 +2990,7 @@ static struct parport_pc_pci {
  	/* netmos_9805 */               { 1, { { 0, -1 }, } },
  	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } },
  	/* netmos_9901 */               { 1, { { 0, -1 }, } },
+	/* netmos_9865 */               { 1, { { 0, -1 }, } },
  	/* quatech_sppxp100 */		{ 1, { { 0, 1 }, } },
  };
 
@@ -3092,6 +3094,10 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
  	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
  	  0xA000, 0x2000, 0, 0, netmos_9901 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x1000, 0, 0, netmos_9865 },
+	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+	  0xA000, 0x2000, 0, 0, netmos_9865 },
  	/* Quatech SPPXP-100 Parallel port PCI ExpressCard */
  	{ PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100,
  	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
drivers/serial/8250_pci.c +21 -1
index b28af13..8b18c3c 100644
@@ -760,7 +760,8 @@ static int pci_netmos_init(struct pci_dev *dev)
  	/* subdevice 0x00PS means<P>  parallel,<S>  serial */
  	unsigned int num_serial = dev->subsystem_device&  0xf;
 
-	if (dev->device == PCI_DEVICE_ID_NETMOS_9901)
+	if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
+		(dev->device == PCI_DEVICE_ID_NETMOS_9865))
  		return 0;
  	if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM&&
  			dev->subsystem_device == 0x0299)
@@ -1479,6 +1480,7 @@ enum pci_board_num_t {
 
  	pbn_b0_bt_1_115200,
  	pbn_b0_bt_2_115200,
+	pbn_b0_bt_4_115200,
  	pbn_b0_bt_8_115200,
 
  	pbn_b0_bt_1_460800,
@@ -1703,6 +1705,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
  		.base_baud	= 115200,
  		.uart_offset	= 8,
  	},
+	[pbn_b0_bt_4_115200] = {
+		.flags		= FL_BASE0|FL_BASE_BARS,
+		.num_ports	= 4,
+		.base_baud	= 115200,
+		.uart_offset	= 8,
+	},
  	[pbn_b0_bt_8_115200] = {
  		.flags		= FL_BASE0|FL_BASE_BARS,
  		.num_ports	= 8,
@@ -3649,6 +3657,18 @@ static struct pci_device_id serial_pci_tbl[] = {
  		0, 0, pbn_b0_1_115200 },
 
  	/*
+	 * Best Connectivity PCI Multi I/O cards
+	 */
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x1000,
+		0, 0, pbn_b0_1_115200 },
+
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
+		0xA000, 0x3004,
+		0, 0, pbn_b0_bt_4_115200 },
+
+	/*
  	 * These entries match devices with class COMMUNICATION_SERIAL,
  	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
  	 */
include/linux/pci_ids.h +1 -0
index 84cf1f3..b2c0bf3 100644
@@ -2675,6 +2675,7 @@
  #define PCI_DEVICE_ID_NETMOS_9835	0x9835
  #define PCI_DEVICE_ID_NETMOS_9845	0x9845
  #define PCI_DEVICE_ID_NETMOS_9855	0x9855
+#define PCI_DEVICE_ID_NETMOS_9865	0x9865
  #define PCI_DEVICE_ID_NETMOS_9901	0x9901
 
  #define PCI_VENDOR_ID_3COM_2		0xa727