Skip to contentSkip to conversation

8250_pci: Add IBM Saturn serial card

PATCH In review Benjamin Herrenschmidt 3 participants 5 messages Oct 13, 2009 – Oct 14, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 8250_pci: Add IBM Saturn serial card

The IBM Saturn serial card has only one port. Without that fixup, the kernel thinks it has two, which confuses userland setup and admin tools as well.

---

Andrew & Others on CC... not sure who takes care of patches to that driver nowadays. Should I send directly to Linus ?

drivers/serial/8250_pci.c +11 -0
index e7108e7..7b5ff09 100644
@@ -1561,6 +1561,7 @@ enum pci_board_num_t {
 	pbn_exar_XR17C152,
 	pbn_exar_XR17C154,
 	pbn_exar_XR17C158,
+	pbn_exar_ibm_saturn,
 	pbn_pasemi_1682M,
 	pbn_ni8430_2,
 	pbn_ni8430_4,
@@ -2146,6 +2147,13 @@ static struct pciserial_board pci_boards[] __devinitdata = {
 		.base_baud	= 921600,
 		.uart_offset	= 0x200,
 	},
+	[pbn_exar_ibm_saturn] = {
+		.flags		= FL_BASE0,
+		.num_ports	= 1,
+		.base_baud	= 921600,
+		.uart_offset	= 0x200,
+	},
+
 	/*
 	 * PA Semi PWRficient PA6T-1682M on-chip UART
 	 */
@@ -2649,6 +2657,9 @@ static struct pci_device_id serial_pci_tbl[] = {
 		PCI_SUBVENDOR_ID_CONNECT_TECH,
 		PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485, 0, 0,
 		pbn_b0_8_1843200_200 },
+	{	PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
+		PCI_VENDOR_ID_IBM, PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT,
+		0, 0, pbn_exar_ibm_saturn },
 
 	{	PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
include/linux/pci_ids.h +2 -0
index 0d96be9..06a7b94 100644
@@ -481,6 +481,8 @@
 #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM	0x0251
 #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361
 #define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL	0x252
+#define PCI_SUBVENDOR_ID_IBM		0x1014
+#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT	0x03d4
 
 #define PCI_VENDOR_ID_UNISYS		0x1018
 #define PCI_DEVICE_ID_UNISYS_DMA_DIRECTOR 0x001C
#1 lore raw
Quoted 4 lines · On Wed, 14 Oct 2009 10:40:53 +1100 Benjamin Herrenschmidt…

The IBM Saturn serial card has only one port. Without that fixup, the kernel thinks it has two, which confuses userland setup and admin tools as well.

That sounds seriousish. I assume it's a long-standing problem, but we only just noticed it?

I'll cc -stable because it's so simple ;)

Quoted 3 lines

Andrew & Others on CC... not sure who takes care of patches to that driver nowadays. Should I send directly to Linus ?

I'll grab them if I see them, especially simple ones. Sometimes Alan grabs them too.

#2 lore raw
Quoted 9 lines · Andrew Morton
Quoted 4 lines · On Wed, 14 Oct 2009 10:40:53 +1100 Benjamin Herrenschmidt…

The IBM Saturn serial card has only one port. Without that fixup, the kernel thinks it has two, which confuses userland setup and admin tools as well.

That sounds seriousish. I assume it's a long-standing problem, but we only just noticed it?

No it's a brand new piece of HW we haven't released yet :-)

Quoted 1 line

I'll cc -stable because it's so simple ;)

Heh, thanks. We need it into distro indeed.

Quoted 5 lines
Quoted 2 lines

Andrew & Others on CC... not sure who takes care of patches to that driver nowadays. Should I send directly to Linus ?

I'll grab them if I see them, especially simple ones. Sometimes Alan grabs them too.

Thanks.

Cheers,
Ben.

#3 lore raw
In reply to Benjamin Herrenschmidt
Quoted 5 lines · On Wed, 14 Oct 2009 10:40:53 +1100 Benjamin Herrenschmidt…

The IBM Saturn serial card has only one port. Without that fixup, the kernel thinks it has two, which confuses userland setup and admin tools as well.

Looks good to me but can you drop a space between the last DEVICE_ID and the VENDOR_ID bit in the header to follow the style ?

Quoted 1 line

---

#4 lore raw
Quoted 11 lines · Alan Cox
Quoted 5 lines · On Wed, 14 Oct 2009 10:40:53 +1100 Benjamin Herrenschmidt…

The IBM Saturn serial card has only one port. Without that fixup, the kernel thinks it has two, which confuses userland setup and admin tools as well.

Looks good to me but can you drop a space between the last DEVICE_ID and the VENDOR_ID bit in the header to follow the style ?

Ok. It was between the last IBM device ID and the IBM subvendor, I wasn't sure if that warranted a blank line :-)

I'll send a new patch from work.

Cheers,
Ben.