diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-21 20:43:45 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-21 20:43:45 +0000 |
| commit | 53da2d96a39440a73d568a8e7389690e27d36c1c (patch) | |
| tree | 76082ac4fe6353d52c3683e28ea405443aee5b7d /sys/dev | |
| parent | 8fe3fec3667e97dc206f2b25c350b95ee7eed1e4 (diff) | |
Add some more ids for existing mac and phy types found
in the FreeBSD driver.
ok claudio@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_em.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index e117aa4840d..c7771e38666 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.236 2010/05/18 21:51:10 jsg Exp $ */ +/* $OpenBSD: if_em.c,v 1.237 2010/06/21 20:43:44 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -118,15 +118,20 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L_PL_2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573V_PM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82574L }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82574LA }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_COPPER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_SERDES }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575GB_QUAD_CPR }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575GB_QP_PM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_FIBER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_SERDES }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_QUAD_COPPER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_QUAD_CU_ET2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_NS }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_NS_SERDES }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_SERDES_QUAD }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH8_82567V_3 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH8_IFE }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH8_IFE_G }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH8_IFE_GT }, diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 2042b08089e..29dd2827405 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.47 2010/05/18 21:51:10 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.48 2010/06/21 20:43:44 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -218,6 +218,7 @@ em_set_phy_type(struct em_hw *hw) break; } case IGP03E1000_E_PHY_ID: + case IGP04E1000_E_PHY_ID: hw->phy_type = em_phy_igp_3; break; case IFE_E_PHY_ID: @@ -456,17 +457,21 @@ em_set_mac_type(struct em_hw *hw) hw->mac_type = em_82573; break; case E1000_DEV_ID_82574L: + case E1000_DEV_ID_82574LA: hw->mac_type = em_82574; break; case E1000_DEV_ID_82575EB_PT: case E1000_DEV_ID_82575EB_PF: case E1000_DEV_ID_82575GB_QP: + case E1000_DEV_ID_82575GB_QP_PM: case E1000_DEV_ID_82576: case E1000_DEV_ID_82576_FIBER: case E1000_DEV_ID_82576_SERDES: case E1000_DEV_ID_82576_QUAD_COPPER: case E1000_DEV_ID_82576_QUAD_CU_ET2: case E1000_DEV_ID_82576_NS: + case E1000_DEV_ID_82576_NS_SERDES: + case E1000_DEV_ID_82576_SERDES_QUAD: hw->mac_type = em_82575; hw->initialize_hw_bits_disable = 1; break; @@ -483,6 +488,7 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_ICH8_IGP_C: case E1000_DEV_ID_ICH8_IGP_M: case E1000_DEV_ID_ICH8_IGP_M_AMT: + case E1000_DEV_ID_ICH8_82567V_3: hw->mac_type = em_ich8lan; break; case E1000_DEV_ID_ICH9_BM: |