Skip to content

Commit

Permalink
net: sfp: extend bitrate-derived mode for 2500BASE-X
Browse files Browse the repository at this point in the history
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>
Link: https://lore.kernel.org/r/E1kyYQf-0004iY-Gh@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Russell King authored and Jakub Kicinski committed Jan 12, 2021
1 parent 624407d commit a006dbf
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/net/phy/sfp-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a006dbf

Please sign in to comment.