diff options
author | Manasi Deval <manasi.deval@intel.com> | 2006-08-16 16:47:20 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-16 16:47:20 -0400 |
commit | 0fe198a5e10229b269624a18bbd390001a8d3476 (patch) | |
tree | 80d96642bec0829a89082a121c78c4aeaa067e0b /drivers/net | |
parent | dc335d9735220b3a9ece5ec2d95864b1e8ff06a0 (diff) |
ixgb: Add CX4 PHY type detection and subdevice ID.
Signed-off-by: Manasi Deval <manasi.deval@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 11 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_ids.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index f7fa10e47fa2..2b1515574faf 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c | |||
@@ -236,6 +236,17 @@ ixgb_identify_phy(struct ixgb_hw *hw) | |||
236 | DEBUGOUT("Identified G6104 optics\n"); | 236 | DEBUGOUT("Identified G6104 optics\n"); |
237 | phy_type = ixgb_phy_type_g6104; | 237 | phy_type = ixgb_phy_type_g6104; |
238 | break; | 238 | break; |
239 | case IXGB_DEVICE_ID_82597EX_CX4: | ||
240 | DEBUGOUT("Identified CX4\n"); | ||
241 | xpak_vendor = ixgb_identify_xpak_vendor(hw); | ||
242 | if (xpak_vendor == ixgb_xpak_vendor_intel) { | ||
243 | DEBUGOUT("Identified TXN17201 optics\n"); | ||
244 | phy_type = ixgb_phy_type_txn17201; | ||
245 | } else { | ||
246 | DEBUGOUT("Identified G6005 optics\n"); | ||
247 | phy_type = ixgb_phy_type_g6005; | ||
248 | } | ||
249 | break; | ||
239 | default: | 250 | default: |
240 | DEBUGOUT("Unknown physical layer module\n"); | 251 | DEBUGOUT("Unknown physical layer module\n"); |
241 | phy_type = ixgb_phy_type_unknown; | 252 | phy_type = ixgb_phy_type_unknown; |
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h index 40a085f94c7b..9fd61189b4b2 100644 --- a/drivers/net/ixgb/ixgb_ids.h +++ b/drivers/net/ixgb/ixgb_ids.h | |||
@@ -45,6 +45,7 @@ | |||
45 | 45 | ||
46 | #define IXGB_DEVICE_ID_82597EX_CX4 0x109E | 46 | #define IXGB_DEVICE_ID_82597EX_CX4 0x109E |
47 | #define IXGB_SUBDEVICE_ID_A00C 0xA00C | 47 | #define IXGB_SUBDEVICE_ID_A00C 0xA00C |
48 | #define IXGB_SUBDEVICE_ID_A01C 0xA01C | ||
48 | 49 | ||
49 | #endif /* #ifndef _IXGB_IDS_H_ */ | 50 | #endif /* #ifndef _IXGB_IDS_H_ */ |
50 | /* End of File */ | 51 | /* End of File */ |