Skip to contentSkip to conversation

net: sfp: relax bitrate-derived mode check

PATCH In review Pali Rohár 2 participants 2 messages Apr 12, 2021 – Apr 15, 2021

Subsystems (4)
Network drivers Stable branch Ethernet PHY SFF/SFP/SFP+ module support
lore
Share & tools
lore

Pali Rohár

author
#0 lore raw

PATCH 1/1 net: sfp: relax bitrate-derived mode check

From: Russell King <[email protected]>

[ Upstream commit 7a77233ec6d114322e2c4f71b4e26dbecd9ea8a7 ]

Do not check the encoding when deriving 1000BASE-X from the bitrate when no other modes are discovered. Some GPON modules (VSOL V2801F and CarlitoxxPro CPGOS03-0490 v2.0) indicate NRZ encoding with a 1200Mbaud bitrate, but should be driven with 1000BASE-X on the host side.

Tested-by Pali Rohár <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Signed-off-by Russell King <[email protected]>
Signed-off-by David S. Miller <[email protected]>

---
Please apply this commit to all stable releases where was already backported commit 0d035bed2a4a6c4878518749348be61bf082d12a ("net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround") as it depends on this commit. If I checked it correctly patch should go into 5.10 release.

---
 drivers/net/phy/sfp-bus.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/phy/sfp-bus.c +5 -6
index 58014feedf6c..20b91f5dfc6e 100644
@@ -334,14 +334,13 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
 	}
 
 	/* If we haven't discovered any modes that this module supports, try
-	 * the encoding and bitrate to determine supported modes. Some BiDi
-	 * modules (eg, 1310nm/1550nm) are not 1000BASE-BX compliant due to
-	 * the differing wavelengths, so do not set any transceiver bits.
+	 * the bitrate to determine supported modes. Some BiDi modules (eg,
+	 * 1310nm/1550nm) are not 1000BASE-BX compliant due to the differing
+	 * wavelengths, so do not set any transceiver bits.
 	 */
 	if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
-		/* If the encoding and bit rate allows 1000baseX */
-		if (id->base.encoding == SFF8024_ENCODING_8B10B && br_nom &&
-		    br_min <= 1300 && br_max >= 1200)
+		/* If the bit rate allows 1000baseX */
+		if (br_nom && br_min <= 1300 && br_max >= 1200)
 			phylink_set(modes, 1000baseX_Full);
 	}
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Pali Rohár

From: Russell King <[email protected]>

[ Upstream commit 7a77233ec6d114322e2c4f71b4e26dbecd9ea8a7 ]

Do not check the encoding when deriving 1000BASE-X from the bitrate when no other modes are discovered. Some GPON modules (VSOL V2801F and CarlitoxxPro CPGOS03-0490 v2.0) indicate NRZ encoding with a 1200Mbaud bitrate, but should be driven with 1000BASE-X on the host side.

Tested-by Pali Rohár <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Signed-off-by Russell King <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Quoted 6 lines

---
Please apply this commit to all stable releases where was already backported commit 0d035bed2a4a6c4878518749348be61bf082d12a ("net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround") as it depends on this commit. If I checked it correctly patch should go into 5.10 release.

Now applied, thanks.

greg k-h