| From 7a77233ec6d114322e2c4f71b4e26dbecd9ea8a7 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| Date: Wed, 9 Dec 2020 11:22:54 +0000 |
| Subject: net: sfp: relax bitrate-derived mode check |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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 <pali@kernel.org> |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| --- |
| drivers/net/phy/sfp-bus.c | 11 +++++------ |
| 1 file changed, 5 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/net/phy/sfp-bus.c |
| +++ b/drivers/net/phy/sfp-bus.c |
| @@ -349,14 +349,13 @@ void sfp_parse_support(struct sfp_bus *b |
| } |
| |
| /* 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); |
| } |
| |