diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-06-04 05:08:44 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-06-04 05:08:44 +0000 |
| commit | 4f502e677f0e81ea16d860be2c6ceae6e648b251 (patch) | |
| tree | 545d84c7f435a123a32be08f3a08f032f78fdbd1 /sys | |
| parent | 99562d3dd13e10a1eae8ceb457bc8cecd1dd47ac (diff) | |
Match em(4) against all the newer chips (82575/6) and treat them all the
same. Not sure if the 82576 is 100% compatible to the 82575 but only when
enabled it will be possible to test them. OK jsg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_em.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 4c8e4a587d2..79de604936a 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.210 2009/06/03 17:39:44 claudio Exp $ */ +/* $OpenBSD: if_em.c,v 1.211 2009/06/04 05:08:43 claudio Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -117,11 +117,13 @@ 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_82575EB_COPPER }, - { 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_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_NS }, { 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 5e77b2051c9..da9cb2fd9f2 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.32 2009/06/03 17:39:44 claudio Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.33 2009/06/04 05:08:43 claudio Exp $ */ /* if_em_hw.c * Shared functions for accessing and configuring the MAC @@ -442,6 +442,12 @@ em_set_mac_type(struct em_hw *hw) break; case E1000_DEV_ID_82575EB_PT: case E1000_DEV_ID_82575EB_PF: + case E1000_DEV_ID_82575GB_QP: + 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_NS: hw->mac_type = em_82575; hw->initialize_hw_bits_disable = 1; break; diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index c0ac5ab857e..9aec75750bc 100644 --- a/sys/dev/pci/if_em_hw.h +++ b/sys/dev/pci/if_em_hw.h @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.h,v 1.28 2009/06/03 17:39:44 claudio Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.29 2009/06/04 05:08:43 claudio Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -512,6 +512,12 @@ int32_t em_check_phy_reset_block(struct em_hw *hw); #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF #define E1000_DEV_ID_82575EB_PT 0x10A7 #define E1000_DEV_ID_82575EB_PF 0x10A9 +#define E1000_DEV_ID_82575GB_QP 0x10D6 +#define E1000_DEV_ID_82576 0x10C9 +#define E1000_DEV_ID_82576_FIBER 0x10E6 +#define E1000_DEV_ID_82576_SERDES 0x10E7 +#define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8 +#define E1000_DEV_ID_82576_NS 0x150A #define NODE_ADDRESS_SIZE 6 #define ETH_LENGTH_OF_ADDRESS 6 |