diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-11 06:53:32 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-11 06:53:32 +0000 |
| commit | a71c2e2f1c7f41b7928d9759085669fd2f4ee761 (patch) | |
| tree | cf062408d2096c1786e01e13b1ea40458b89aabf /sys/dev/pci | |
| parent | d0f2e500f75792ebacef5b90ae9194438bfcef43 (diff) | |
Add support for another 82599 SFP+ card. Original diff and tests by
Chris Maxwell <chris ! maxwell () hootsuite.com>
ok jsg
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_ix.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe_82599.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe_type.h | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 8f178043e47..9592781b206 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.69 2012/08/10 10:56:22 mikeb Exp $ */ +/* $OpenBSD: if_ix.c,v 1.70 2012/08/11 06:53:31 mikeb Exp $ */ /****************************************************************************** @@ -72,6 +72,7 @@ const struct pci_matchid ixgbe_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_T3_LOM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP_EM }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP_SF2 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP_FCOE }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X540T }, #if 0 @@ -1414,6 +1415,7 @@ ixgbe_identify_hardware(struct ix_softc *sc) case PCI_PRODUCT_INTEL_82599_SFP: case PCI_PRODUCT_INTEL_82599_SFP_EM: case PCI_PRODUCT_INTEL_82599_SFP_FCOE: + case PCI_PRODUCT_INTEL_82599_SFP_SF2: sc->hw.mac.type = ixgbe_mac_82599EB; sc->optics = IFM_10G_SR; sc->hw.phy.smart_speed = ixgbe_smart_speed; diff --git a/sys/dev/pci/ixgbe_82599.c b/sys/dev/pci/ixgbe_82599.c index dd40b1e2250..78b506d2633 100644 --- a/sys/dev/pci/ixgbe_82599.c +++ b/sys/dev/pci/ixgbe_82599.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe_82599.c,v 1.5 2012/08/06 21:07:52 mikeb Exp $ */ +/* $OpenBSD: ixgbe_82599.c,v 1.6 2012/08/11 06:53:31 mikeb Exp $ */ /****************************************************************************** @@ -445,6 +445,7 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) break; case IXGBE_DEV_ID_82599_SFP: case IXGBE_DEV_ID_82599_SFP_FCOE: + case IXGBE_DEV_ID_82599_SFP_SF2: media_type = ixgbe_media_type_fiber; break; case IXGBE_DEV_ID_82599_CX4: diff --git a/sys/dev/pci/ixgbe_type.h b/sys/dev/pci/ixgbe_type.h index 14424a42ba8..6871664f85c 100644 --- a/sys/dev/pci/ixgbe_type.h +++ b/sys/dev/pci/ixgbe_type.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe_type.h,v 1.12 2012/08/06 21:07:52 mikeb Exp $ */ +/* $OpenBSD: ixgbe_type.h,v 1.13 2012/08/11 06:53:31 mikeb Exp $ */ /****************************************************************************** @@ -61,11 +61,12 @@ #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C #define IXGBE_DEV_ID_82599_CX4 0x10F9 #define IXGBE_DEV_ID_82599_SFP 0x10FB -#define IXGBE_DEV_ID_82599_SFP_EM 0x1507 #define IXGBE_SUBDEV_ID_82599_SFP 0x11A9 #define IXGBE_SUBDEV_ID_82599_560FLR 0x17D0 #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A #define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529 +#define IXGBE_DEV_ID_82599_SFP_EM 0x1507 +#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D #define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC #define IXGBE_DEV_ID_82599_T3_LOM 0x151C #define IXGBE_DEV_ID_82599_VF 0x10ED |