diff options
author | joshua.a.hay@intel.com <joshua.a.hay@intel.com> | 2012-09-20 20:08:21 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-10-03 11:38:30 -0400 |
commit | df376f0de167754da9b3ece4afdb5bb8bf3fbf3e (patch) | |
tree | 462da44cf94fadb6fe0fe5b8dc859e41e79d498d /drivers/net/ethernet | |
parent | 4a97df0bfaa8c0c1cd057cb8f1030a71cb4d8832 (diff) |
ixgbe: add support for X540-AT1
This patch adds device support for Ethernet Controller X540-AT1.
Signed-off-by: Josh Hay <joshua.a.hay@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 90e41db3cb69..dbf37e4a45fd 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
@@ -70,6 +70,7 @@ static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) | |||
70 | 70 | ||
71 | switch (hw->device_id) { | 71 | switch (hw->device_id) { |
72 | case IXGBE_DEV_ID_X540T: | 72 | case IXGBE_DEV_ID_X540T: |
73 | case IXGBE_DEV_ID_X540T1: | ||
73 | return 0; | 74 | return 0; |
74 | case IXGBE_DEV_ID_82599_T3_LOM: | 75 | case IXGBE_DEV_ID_82599_T3_LOM: |
75 | return 0; | 76 | return 0; |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index c407b2f0f0f9..fa3d552e1f4a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -114,6 +114,7 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { | |||
114 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 }, | 114 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 }, |
115 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 }, | 115 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 }, |
116 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 }, | 116 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 }, |
117 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 }, | ||
117 | /* required last entry */ | 118 | /* required last entry */ |
118 | {0, } | 119 | {0, } |
119 | }; | 120 | }; |
@@ -7054,6 +7055,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id, | |||
7054 | is_wol_supported = 1; | 7055 | is_wol_supported = 1; |
7055 | break; | 7056 | break; |
7056 | case IXGBE_DEV_ID_X540T: | 7057 | case IXGBE_DEV_ID_X540T: |
7058 | case IXGBE_DEV_ID_X540T1: | ||
7057 | /* check eeprom to see if enabled wol */ | 7059 | /* check eeprom to see if enabled wol */ |
7058 | if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) || | 7060 | if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) || |
7059 | ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) && | 7061 | ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) && |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index 400f86a31174..0722f3368092 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | |||
@@ -65,6 +65,7 @@ | |||
65 | #define IXGBE_DEV_ID_82599_LS 0x154F | 65 | #define IXGBE_DEV_ID_82599_LS 0x154F |
66 | #define IXGBE_DEV_ID_X540T 0x1528 | 66 | #define IXGBE_DEV_ID_X540T 0x1528 |
67 | #define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A | 67 | #define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A |
68 | #define IXGBE_DEV_ID_X540T1 0x1560 | ||
68 | 69 | ||
69 | /* VF Device IDs */ | 70 | /* VF Device IDs */ |
70 | #define IXGBE_DEV_ID_82599_VF 0x10ED | 71 | #define IXGBE_DEV_ID_82599_VF 0x10ED |