[PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Jiri Slaby]

Let it as serial, since it doesn't have subdevice in the form of 0x00PS.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/pci/quirks.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 400d868..4d42c16 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1585,9 +1585,13 @@ static void __devinit quirk_netmos(struct pci_dev *dev)
 	 * of parallel ports and <S> is the number of serial ports.
 	 */
 	switch (dev->device) {
+	case PCI_DEVICE_ID_NETMOS_9835:
+		/* Well, this rule doesn't hold for the following 9835 device */
+		if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+				dev->subsystem_device == 0x0299)
+			return;
 	case PCI_DEVICE_ID_NETMOS_9735:
 	case PCI_DEVICE_ID_NETMOS_9745:
-	case PCI_DEVICE_ID_NETMOS_9835:
 	case PCI_DEVICE_ID_NETMOS_9845:
 	case PCI_DEVICE_ID_NETMOS_9855:
 		if ((dev->class >> 8) == PCI_CLASS_COMMUNICATION_SERIAL &&
-- 
1.6.0.5

[PATCH 2/2] 8250_pci: add support for netmos 9835

[Jiri Slaby]

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/serial/8250_pci.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 1948c81..766cfac 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -600,6 +600,10 @@ 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->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+			dev->subsystem_device == 0x0299)
+		return 0;
+
 	if (num_serial == 0)
 		return -ENODEV;
 	return num_serial;
@@ -3091,6 +3095,10 @@ static struct pci_device_id serial_pci_tbl[] = {
 		0,
 		pbn_b0_8_115200 },
 
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
+		PCI_VENDOR_ID_IBM, 0x0299,
+		0, 0, pbn_b0_bt_2_115200 },
+
 	/*
 	 * These entries match devices with class COMMUNICATION_SERIAL,
 	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
-- 
1.6.0.5

[PATCH 2/2 #2] 8250_pci: add support for netmos 9835

[Jiri Slaby]

Most of netmos 9835 hardware is handled by parport-serial.
IBM introduces a device which doesn't have any parallel ports and
have screwed subdevice PCI id (not corresponding to port numbers).

Handle this device (9710:9835 1014:0299) properly.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/serial/8250_pci.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 1948c81..766cfac 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -600,6 +600,10 @@ 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->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+			dev->subsystem_device == 0x0299)
+		return 0;
+
 	if (num_serial == 0)
 		return -ENODEV;
 	return num_serial;
@@ -3091,6 +3095,10 @@ static struct pci_device_id serial_pci_tbl[] = {
 		0,
 		pbn_b0_8_115200 },
 
+	{	PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
+		PCI_VENDOR_ID_IBM, 0x0299,
+		0, 0, pbn_b0_bt_2_115200 },
+
 	/*
 	 * These entries match devices with class COMMUNICATION_SERIAL,
 	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
-- 
1.6.0.5

Re: [PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Jesse Barnes]

On Monday, December 08, 2008 7:19 am Jiri Slaby wrote:
> Let it as serial, since it doesn't have subdevice in the form of 0x00PS.
>
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>

Applied to my linux-next branch, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Jiri Slaby]

Jesse Barnes wrote:
> On Monday, December 08, 2008 7:19 am Jiri Slaby wrote:
>> Let it as serial, since it doesn't have subdevice in the form of 0x00PS.
>>
>> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
>> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> Applied to my linux-next branch, thanks.

Hi, did this get lost by a chance? I don't see it in your -next branch
anymore. Neither in any other branch nor upstream.

BTW I got:
This patch was dropped because it was merged into mainline or a subsystem tree
from Andrew, so it had to be somewhere, I suppose...

Re: [PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Andrew Morton]

On Sun, 08 Feb 2009 22:58:39 +0100 Jiri Slaby <jirislaby@gmail.com> wrote:

> Jesse Barnes wrote:
> > On Monday, December 08, 2008 7:19 am Jiri Slaby wrote:
> >> Let it as serial, since it doesn't have subdevice in the form of 0x00PS.
> >>
> >> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> >> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 
> > Applied to my linux-next branch, thanks.
> 
> Hi, did this get lost by a chance? I don't see it in your -next branch
> anymore. Neither in any other branch nor upstream.
> 
> BTW I got:
> This patch was dropped because it was merged into mainline or a subsystem tree
> from Andrew, so it had to be somewhere, I suppose...

yes, it got lost.  I resurrected it.

Re: [PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Jesse Barnes]

On Sunday, February 8, 2009 2:45 pm Andrew Morton wrote:
> On Sun, 08 Feb 2009 22:58:39 +0100 Jiri Slaby <jirislaby@gmail.com> wrote:
> > Jesse Barnes wrote:
> > > On Monday, December 08, 2008 7:19 am Jiri Slaby wrote:
> > >> Let it as serial, since it doesn't have subdevice in the form of
> > >> 0x00PS.
> > >>
> > >> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> > >> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> > >
> > > Applied to my linux-next branch, thanks.
> >
> > Hi, did this get lost by a chance? I don't see it in your -next branch
> > anymore. Neither in any other branch nor upstream.
> >
> > BTW I got:
> > This patch was dropped because it was merged into mainline or a subsystem
> > tree from Andrew, so it had to be somewhere, I suppose...
>
> yes, it got lost.  I resurrected it.

Sorry I must have been thinking about another patch when I replied; the 
contents don't look familiar.  Anyway I'll pick it up now.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH 1/2] PCI: quirks, don't mark one netmos as class other

[Jesse Barnes]

On Monday, December 8, 2008 7:19 am Jiri Slaby wrote:
> Let it as serial, since it doesn't have subdevice in the form of 0x00PS.
>
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>

Ok, applied this one for real now, to my linux-next branch. :)

-- 
Jesse Barnes, Intel Open Source Technology Center