The patch titled
ixgb: Add CX4 PHY type detection and subdevice ID.
has been added to the -mm tree. Its filename is
ixgb-add-cx4-phy-type-detection-and-subdevice-id.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ixgb: Add CX4 PHY type detection and subdevice ID.
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Manasi Deval <manasi.deval@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/ixgb/ixgb_hw.c | 11 +++++++++++
drivers/net/ixgb/ixgb_ids.h | 1 +
2 files changed, 12 insertions(+)
diff -puN drivers/net/ixgb/ixgb_hw.c~ixgb-add-cx4-phy-type-detection-and-subdevice-id drivers/net/ixgb/ixgb_hw.c
--- a/drivers/net/ixgb/ixgb_hw.c~ixgb-add-cx4-phy-type-detection-and-subdevice-id
+++ a/drivers/net/ixgb/ixgb_hw.c
@@ -236,6 +236,17 @@ ixgb_identify_phy(struct ixgb_hw *hw)
DEBUGOUT("Identified G6104 optics\n");
phy_type = ixgb_phy_type_g6104;
break;
+ case IXGB_DEVICE_ID_82597EX_CX4:
+ DEBUGOUT("Identified CX4\n");
+ xpak_vendor = ixgb_identify_xpak_vendor(hw);
+ if (xpak_vendor == ixgb_xpak_vendor_intel) {
+ DEBUGOUT("Identified TXN17201 optics\n");
+ phy_type = ixgb_phy_type_txn17201;
+ } else {
+ DEBUGOUT("Identified G6005 optics\n");
+ phy_type = ixgb_phy_type_g6005;
+ }
+ break;
default:
DEBUGOUT("Unknown physical layer module\n");
phy_type = ixgb_phy_type_unknown;
diff -puN drivers/net/ixgb/ixgb_ids.h~ixgb-add-cx4-phy-type-detection-and-subdevice-id drivers/net/ixgb/ixgb_ids.h
--- a/drivers/net/ixgb/ixgb_ids.h~ixgb-add-cx4-phy-type-detection-and-subdevice-id
+++ a/drivers/net/ixgb/ixgb_ids.h
@@ -45,6 +45,7 @@
#define IXGB_DEVICE_ID_82597EX_CX4 0x109E
#define IXGB_SUBDEVICE_ID_A00C 0xA00C
+#define IXGB_SUBDEVICE_ID_A01C 0xA01C
#endif /* #ifndef _IXGB_IDS_H_ */
/* End of File */
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
e100-fix-mdio-mdio-x.patch
e100-increment-version-to-3510-k4.patch
e1000-same-cosmetic-fix-as-earlier-sent-out-for-ipv4.patch
e1000-remove-0x1000-as-supported-device.patch
e1000-explicitly-power-up-the-phy-during-loopback-testing.patch
e1000-explicit-locking-for-two-ethtool-path-functions.patch
e1000-allow-nvm-to-setup-lplu-for-igp2-and-igp3.patch
e1000-force-full-dma-clocking-for-10-100-speed.patch
e1000-disable-aggressive-clocking-on-esb2-with-serdes-port.patch
e1000-increment-driver-version-to-719-k6.patch
ixgb-add-cx4-phy-type-detection-and-subdevice-id.patch
ixgb-fix-cache-miss-due-to-miscalculation.patch
ixgb-increment-version-to-10109-k4.patch
ixgb-add-pci-error-recovery-callbacks.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
e1000_7033_dump_ring.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
