[PATCH] e1000: Support e1000 OEMed onto Aculab cards

[PATCH] e1000: Support e1000 OEMed onto Aculab cards

[Mark Brown]

Add PCI IDs for chips OEMed onto some Aculab cards to the e1000 driver.

Signed-Off-By: Mark Brown <broonie@sirena.org.uk>

Index: e1000-queue/drivers/net/e1000/e1000.h
===================================================================
--- e1000-queue.orig/drivers/net/e1000/e1000.h	2006-02-25 12:50:12.000000000 +0000
+++ e1000-queue/drivers/net/e1000/e1000.h	2006-02-25 13:01:10.000000000 +0000
@@ -84,6 +84,9 @@
 #define INTEL_E1000_ETHERNET_DEVICE(device_id) {\
 	PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
 
+#define ACULAB_E1000_ETHERNET_DEVICE(device_id) {\
+	PCI_DEVICE(PCI_VENDOR_ID_ACULAB, device_id)}
+
 struct e1000_adapter;
 
 #include "e1000_hw.h"
Index: e1000-queue/drivers/net/e1000/e1000_main.c
===================================================================
--- e1000-queue.orig/drivers/net/e1000/e1000_main.c	2006-02-25 12:50:12.000000000 +0000
+++ e1000-queue/drivers/net/e1000/e1000_main.c	2006-02-25 13:01:10.000000000 +0000
@@ -98,6 +98,7 @@ static struct pci_device_id e1000_pci_tb
 	INTEL_E1000_ETHERNET_DEVICE(0x108B),
 	INTEL_E1000_ETHERNET_DEVICE(0x108C),
 	INTEL_E1000_ETHERNET_DEVICE(0x109A),
+	ACULAB_E1000_ETHERNET_DEVICE(0x1078),
 	/* required last entry */
 	{0,}
 };

Index: e1000-queue/include/linux/pci_ids.h
===================================================================
--- e1000-queue.orig/include/linux/pci_ids.h	2006-02-25 12:50:12.000000000 +0000
+++ e1000-queue/include/linux/pci_ids.h	2006-02-25 12:51:51.000000000 +0000
@@ -1572,6 +1572,8 @@
 #define PCI_VENDOR_ID_NVIDIA_SGS	0x12d2
 #define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
 
+#define PCI_VENDOR_ID_ACULAB 0x12d9
+
 #define PCI_SUBVENDOR_ID_CHASE_PCIFAST		0x12E0
 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST4		0x0031
 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST8		0x0021

-- 
"You grabbed my hand and we fell into it, like a daydream - or a fever."

Re: [PATCH] e1000: Support e1000 OEMed onto Aculab cards

[John Ronciak]

Please don't apply this patch.  We have taken this offline at the
moment to work this out with the OEM, Aculab.  They have made
modification to how the Intel controller operates which may make it
have problems with the normal e1000 driver.  We are in contact with
both Mark and Aculab about this offline.  The last thing Aculab talked
to us about was to make sure that the normal Intel e1000 drivers did
_not_ work with their hardware, hence the device ID change.  We'll
continue this on this thread if this turns out not to be the case.  We
(Intel) also don't know exactly how they changed the behavior of the
hardware which is another topic for us to talk about.

Thanks.
--
Cheers,
John