diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2011-05-14 02:36:35 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-14 21:10:32 -0400 |
commit | 4f6290cf610a7a48b39603ff7822746463453e01 (patch) | |
tree | db243213e9bd612f82bedd8952d8d51c27998354 /drivers/net | |
parent | c050999e2c00b189a21df3ee9ad8d27c85ce9c34 (diff) |
ixgbe: Add support for new 82599 adapter
This patch adds support for a new adapter in the 82599 family. Included
in that support is a new media_type ixgbe_media_type_fiber_lco.
Signed-of-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 3 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_type.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index dba5ca6e35c4..8ee661245af3 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -368,6 +368,9 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) | |||
368 | case IXGBE_DEV_ID_82599_T3_LOM: | 368 | case IXGBE_DEV_ID_82599_T3_LOM: |
369 | media_type = ixgbe_media_type_copper; | 369 | media_type = ixgbe_media_type_copper; |
370 | break; | 370 | break; |
371 | case IXGBE_DEV_ID_82599_LS: | ||
372 | media_type = ixgbe_media_type_fiber_lco; | ||
373 | break; | ||
371 | default: | 374 | default: |
372 | media_type = ixgbe_media_type_unknown; | 375 | media_type = ixgbe_media_type_unknown; |
373 | break; | 376 | break; |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 4be2af22d69b..2dce3d038188 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -126,6 +126,8 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { | |||
126 | board_X540 }, | 126 | board_X540 }, |
127 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), | 127 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), |
128 | board_82599 }, | 128 | board_82599 }, |
129 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), | ||
130 | board_82599 }, | ||
129 | 131 | ||
130 | /* required last entry */ | 132 | /* required last entry */ |
131 | {0, } | 133 | {0, } |
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h index 70e6870be01f..fa43f2507f43 100644 --- a/drivers/net/ixgbe/ixgbe_type.h +++ b/drivers/net/ixgbe/ixgbe_type.h | |||
@@ -62,6 +62,7 @@ | |||
62 | #define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC | 62 | #define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC |
63 | #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8 | 63 | #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8 |
64 | #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C | 64 | #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C |
65 | #define IXGBE_DEV_ID_82599_LS 0x154F | ||
65 | #define IXGBE_DEV_ID_X540T 0x1528 | 66 | #define IXGBE_DEV_ID_X540T 0x1528 |
66 | 67 | ||
67 | /* General Registers */ | 68 | /* General Registers */ |
@@ -2395,6 +2396,7 @@ enum ixgbe_sfp_type { | |||
2395 | enum ixgbe_media_type { | 2396 | enum ixgbe_media_type { |
2396 | ixgbe_media_type_unknown = 0, | 2397 | ixgbe_media_type_unknown = 0, |
2397 | ixgbe_media_type_fiber, | 2398 | ixgbe_media_type_fiber, |
2399 | ixgbe_media_type_fiber_lco, | ||
2398 | ixgbe_media_type_copper, | 2400 | ixgbe_media_type_copper, |
2399 | ixgbe_media_type_backplane, | 2401 | ixgbe_media_type_backplane, |
2400 | ixgbe_media_type_cx4, | 2402 | ixgbe_media_type_cx4, |