diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-25 10:56:08 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-25 10:56:08 +0000 |
| commit | b29050e2bfefa1ece45f541e54b0b1eb16e580c2 (patch) | |
| tree | daa5314f160ee6cb9424ee6ede824b16e1431e71 | |
| parent | 4fea20c86b975e4b88e6b923536ae28000dc8d78 (diff) | |
Add support for the 82599 ExpressModule (X520-P2) card.
| -rw-r--r-- | sys/dev/pci/if_ix.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe_82599.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe_type.h | 13 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 58cba80dee4..5f35626c677 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.36 2010/02/23 18:43:15 jsg Exp $ */ +/* $OpenBSD: if_ix.c,v 1.37 2010/02/25 10:56:07 jsg Exp $ */ /****************************************************************************** @@ -67,7 +67,8 @@ const struct pci_matchid ixgbe_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_XAUI }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_COMBO_BACKPLANE }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_CX4 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP } + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_SFP_EM } }; /********************************************************************* @@ -1276,6 +1277,7 @@ ixgbe_identify_hardware(struct ix_softc *sc) sc->optics = IFM_AUTO; break; case PCI_PRODUCT_INTEL_82599_SFP: + case PCI_PRODUCT_INTEL_82599_SFP_EM: sc->hw.mac.type = ixgbe_mac_82599EB; sc->optics = IFM_10G_SR; break; diff --git a/sys/dev/pci/ixgbe_82599.c b/sys/dev/pci/ixgbe_82599.c index a9d0f4a638a..56dc114be3a 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.1 2010/02/23 18:43:15 jsg Exp $ */ +/* $OpenBSD: ixgbe_82599.c,v 1.2 2010/02/25 10:56:07 jsg Exp $ */ /****************************************************************************** @@ -410,6 +410,7 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) media_type = ixgbe_media_type_backplane; break; case IXGBE_DEV_ID_82599_SFP: + case IXGBE_DEV_ID_82599_SFP_EM: 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 a7ad877dfc5..361ea8861c0 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.5 2010/02/19 19:06:31 jsg Exp $ */ +/* $OpenBSD: ixgbe_type.h,v 1.6 2010/02/25 10:56:07 jsg Exp $ */ /****************************************************************************** @@ -54,12 +54,13 @@ #define IXGBE_DEV_ID_82598_DA_DUAL_PORT 0x10F1 #define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM 0x10E1 #define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4 -#define IXGBE_DEV_ID_82599_KX4 0x10F7 -#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514 +#define IXGBE_DEV_ID_82599_KX4 0x10F7 +#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8 -#define IXGBE_DEV_ID_82599_CX4 0x10F9 -#define IXGBE_DEV_ID_82599_SFP 0x10FB -#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC +#define IXGBE_DEV_ID_82599_CX4 0x10F9 +#define IXGBE_DEV_ID_82599_SFP 0x10FB +#define IXGBE_DEV_ID_82599_SFP_EM 0x1507 +#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC /* General Registers */ #define IXGBE_CTRL 0x00000 |