aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2016-03-21 14:21:31 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-04-07 18:58:52 -0400
commita711ad89a887f7cb2ecbea591a58b6102ad9be7a (patch)
tree0ff059d690dde430010829b8e0d6c8c104d653b9
parent8220bbc12d39175964cb56e100fabcedd59c48da (diff)
ixgbe: Add support for single-port X550 device
Add support for a single-port X550 device. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_common.c1
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_type.h1
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 ee43a383aa0a..8c560da29d23 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -97,6 +97,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
97 case IXGBE_DEV_ID_X540T: 97 case IXGBE_DEV_ID_X540T:
98 case IXGBE_DEV_ID_X540T1: 98 case IXGBE_DEV_ID_X540T1:
99 case IXGBE_DEV_ID_X550T: 99 case IXGBE_DEV_ID_X550T:
100 case IXGBE_DEV_ID_X550T1:
100 case IXGBE_DEV_ID_X550EM_X_10G_T: 101 case IXGBE_DEV_ID_X550EM_X_10G_T:
101 supported = true; 102 supported = true;
102 break; 103 break;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index d5509cc30abd..9594438ffa07 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -125,6 +125,7 @@ static const struct pci_device_id ixgbe_pci_tbl[] = {
125 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 }, 125 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },
126 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 }, 126 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },
127 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), board_X550}, 127 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), board_X550},
128 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T1), board_X550},
128 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x}, 129 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x},
129 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x}, 130 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},
130 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x}, 131 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},
@@ -8983,6 +8984,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
8983 case IXGBE_DEV_ID_X540T: 8984 case IXGBE_DEV_ID_X540T:
8984 case IXGBE_DEV_ID_X540T1: 8985 case IXGBE_DEV_ID_X540T1:
8985 case IXGBE_DEV_ID_X550T: 8986 case IXGBE_DEV_ID_X550T:
8987 case IXGBE_DEV_ID_X550T1:
8986 case IXGBE_DEV_ID_X550EM_X_KX4: 8988 case IXGBE_DEV_ID_X550EM_X_KX4:
8987 case IXGBE_DEV_ID_X550EM_X_KR: 8989 case IXGBE_DEV_ID_X550EM_X_KR:
8988 case IXGBE_DEV_ID_X550EM_X_10G_T: 8990 case IXGBE_DEV_ID_X550EM_X_10G_T:
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 7ae4bbd26ad8..bd95be2d7927 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -75,6 +75,7 @@
75#define IXGBE_DEV_ID_X540T1 0x1560 75#define IXGBE_DEV_ID_X540T1 0x1560
76 76
77#define IXGBE_DEV_ID_X550T 0x1563 77#define IXGBE_DEV_ID_X550T 0x1563
78#define IXGBE_DEV_ID_X550T1 0x15D1
78#define IXGBE_DEV_ID_X550EM_X_KX4 0x15AA 79#define IXGBE_DEV_ID_X550EM_X_KX4 0x15AA
79#define IXGBE_DEV_ID_X550EM_X_KR 0x15AB 80#define IXGBE_DEV_ID_X550EM_X_KR 0x15AB
80#define IXGBE_DEV_ID_X550EM_X_SFP 0x15AC 81#define IXGBE_DEV_ID_X550EM_X_SFP 0x15AC