aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2010-12-02 22:32:34 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-03 12:36:47 -0500
commitdbffcb210f45239ea530e0a71470e48abefe4210 (patch)
tree2fe6a378eb37798213e7fb8e7bdb2ad35b78cf5c /drivers/net/ixgbe
parent0b077feac00a8b7b0afbab3274b2e74b749bc917 (diff)
ixgbe: add support for 82599 FCoE SKU
Add both NIC and backplane support for FCoE enabled devices IDs. Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
-rw-r--r--drivers/net/ixgbe/ixgbe_type.h2
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 8fa76785b45c..385ccebb826c 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -319,11 +319,13 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
319 case IXGBE_DEV_ID_82599_KX4_MEZZ: 319 case IXGBE_DEV_ID_82599_KX4_MEZZ:
320 case IXGBE_DEV_ID_82599_COMBO_BACKPLANE: 320 case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
321 case IXGBE_DEV_ID_82599_KR: 321 case IXGBE_DEV_ID_82599_KR:
322 case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
322 case IXGBE_DEV_ID_82599_XAUI_LOM: 323 case IXGBE_DEV_ID_82599_XAUI_LOM:
323 /* Default device ID is mezzanine card KX/KX4 */ 324 /* Default device ID is mezzanine card KX/KX4 */
324 media_type = ixgbe_media_type_backplane; 325 media_type = ixgbe_media_type_backplane;
325 break; 326 break;
326 case IXGBE_DEV_ID_82599_SFP: 327 case IXGBE_DEV_ID_82599_SFP:
328 case IXGBE_DEV_ID_82599_SFP_FCOE:
327 case IXGBE_DEV_ID_82599_SFP_EM: 329 case IXGBE_DEV_ID_82599_SFP_EM:
328 media_type = ixgbe_media_type_fiber; 330 media_type = ixgbe_media_type_fiber;
329 break; 331 break;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 5f4c93d40a45..c5c93408212d 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -109,6 +109,10 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
109 board_82599 }, 109 board_82599 },
110 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), 110 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4),
111 board_82599 }, 111 board_82599 },
112 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE),
113 board_82599 },
114 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE),
115 board_82599 },
112 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM), 116 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM),
113 board_82599 }, 117 board_82599 },
114 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE), 118 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE),
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 9557ae64f951..35b60db5e776 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -54,6 +54,8 @@
54#define IXGBE_DEV_ID_82599_T3_LOM 0x151C 54#define IXGBE_DEV_ID_82599_T3_LOM 0x151C
55#define IXGBE_DEV_ID_82599_CX4 0x10F9 55#define IXGBE_DEV_ID_82599_CX4 0x10F9
56#define IXGBE_DEV_ID_82599_SFP 0x10FB 56#define IXGBE_DEV_ID_82599_SFP 0x10FB
57#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152a
58#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529
57#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9 59#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9
58#define IXGBE_DEV_ID_82599_SFP_EM 0x1507 60#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
59#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC 61#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC