diff mbox series

[net-next] net: sfp: extend bitrate-derived mode for 2500BASE-X

Message ID E1kyYQf-0004iY-Gh@rmk-PC.armlinux.org.uk
State New
Headers show
Series [net-next] net: sfp: extend bitrate-derived mode for 2500BASE-X | expand

Commit Message

Russell King (Oracle) Jan. 10, 2021, 10:58 a.m. UTC 
Extend the bitrate-derived support to include 2500BASE-X for modules
that report a bitrate of 2500Mbaud.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 drivers/net/phy/sfp-bus.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Jakub Kicinski Jan. 12, 2021, 12:19 a.m. UTC | #1 
On Sun, 10 Jan 2021 17:49:54 +0100 Andrew Lunn wrote:
> On Sun, Jan 10, 2021 at 10:58:37AM +0000, Russell King wrote:

> > Extend the bitrate-derived support to include 2500BASE-X for modules

> > that report a bitrate of 2500Mbaud.

> > 

> > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>  

> 

> Reviewed-by: Andrew Lunn <andrew@lunn.ch>


Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 20b91f5dfc6e..cdfa0a190962 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -337,11 +337,16 @@  void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
 	 * 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.
+	 *
+	 * Do the same for modules supporting 2500BASE-X. Note that some
+	 * modules use 2500Mbaud rather than 3100 or 3200Mbaud for
+	 * 2500BASE-X, so we allow some slack here.
 	 */
-	if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
-		/* If the bit rate allows 1000baseX */
-		if (br_nom && br_min <= 1300 && br_max >= 1200)
+	if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS) && br_nom) {
+		if (br_min <= 1300 && br_max >= 1200)
 			phylink_set(modes, 1000baseX_Full);
+		if (br_min <= 3200 && br_max >= 2500)
+			phylink_set(modes, 2500baseX_Full);
 	}
 
 	if (bus->sfp_quirk)