add a few more Intel Gig PCI ids.

Some of these are from jason@ and the rest are from the Linux PCI ids page.

3 files changed, 28 insertions, 4 deletions

diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index a34de5a7375..7da9cc24cbc 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.114 2006/04/16 03:54:30 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.115 2006/04/18 19:06:02 brad Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -86,9 +86,12 @@ const struct pci_matchid em_devices[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_CPR },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_CPR_K },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_2 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_AF },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_AT },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_COPPER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_FIBER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_SERDES },
@@ -98,7 +101,12 @@ const struct pci_matchid em_devices[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_IAMT },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L }
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_KCS },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_PM },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L_PL_1 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L_PL_2 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573V_PM }
 };
 
 /*********************************************************************
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index b9044d3b46c..5320d8ae93f 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.16 2006/03/28 05:33:03 brad Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.17 2006/04/18 19:06:02 brad Exp $ */
 
 /* if_em_hw.c
  * Shared functions for accessing and configuring the MAC
@@ -333,6 +333,7 @@ em_set_mac_type(struct em_hw *hw)
     case E1000_DEV_ID_82546GB_PCIE:
     case E1000_DEV_ID_82546GB_QUAD_COPPER:
     case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+    case E1000_DEV_ID_82546GB_2:
         hw->mac_type = em_82546_rev_3;
         break;
     case E1000_DEV_ID_82541EI:
@@ -353,6 +354,8 @@ em_set_mac_type(struct em_hw *hw)
     case E1000_DEV_ID_82547GI:
         hw->mac_type = em_82547_rev_2;
         break;
+    case E1000_DEV_ID_82571EB_AF:
+    case E1000_DEV_ID_82571EB_AT:
     case E1000_DEV_ID_82571EB_COPPER:
     case E1000_DEV_ID_82571EB_FIBER:
     case E1000_DEV_ID_82571EB_SERDES:
@@ -366,7 +369,12 @@ em_set_mac_type(struct em_hw *hw)
         break;
     case E1000_DEV_ID_82573E:
     case E1000_DEV_ID_82573E_IAMT:
+    case E1000_DEV_ID_82573E_KCS:
+    case E1000_DEV_ID_82573E_PM:
     case E1000_DEV_ID_82573L:
+    case E1000_DEV_ID_82573L_PL_1:
+    case E1000_DEV_ID_82573L_PL_2:
+    case E1000_DEV_ID_82573V_PM:
         hw->mac_type = em_82573;
         break;
     case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h
index 704d61bd0c2..df83079b30d 100644
--- a/sys/dev/pci/if_em_hw.h
+++ b/sys/dev/pci/if_em_hw.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.h,v 1.12 2006/03/28 05:33:03 brad Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.13 2006/04/18 19:06:02 brad Exp $ */
 /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
 
 /* if_em_hw.h
@@ -488,6 +488,7 @@ int32_t em_set_pci_ex_no_snoop(struct em_hw *hw, uint32_t no_snoop);
 #define E1000_DEV_ID_82546GB_FIBER       0x107A
 #define E1000_DEV_ID_82546GB_SERDES      0x107B
 #define E1000_DEV_ID_82546GB_PCIE        0x108A
+#define E1000_DEV_ID_82573E_KCS          0x108E
 #define E1000_DEV_ID_82546GB_QUAD_COPPER 0x1099
 #define E1000_DEV_ID_82547EI             0x1019
 #define E1000_DEV_ID_82547EI_MOBILE      0x101A
@@ -501,6 +502,13 @@ int32_t em_set_pci_ex_no_snoop(struct em_hw *hw, uint32_t no_snoop);
 #define E1000_DEV_ID_82573E              0x108B
 #define E1000_DEV_ID_82573E_IAMT         0x108C
 #define E1000_DEV_ID_82573L              0x109A
+#define E1000_DEV_ID_82546GB_2           0x109B
+#define E1000_DEV_ID_82571EB_AT          0x10A0
+#define E1000_DEV_ID_82571EB_AF          0x10A1
+#define E1000_DEV_ID_82573L_PL_1         0x10B0
+#define E1000_DEV_ID_82573V_PM           0x10B2
+#define E1000_DEV_ID_82573E_PM           0x10B3
+#define E1000_DEV_ID_82573L_PL_2         0x10B4
 #define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5
 #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT     0x1096
 #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT     0x1098