Commit adcbadfd authored by Marek Behún's avatar Marek Behún Committed by Jakub Kicinski
Browse files

net: sfp: Fix quirk for Ubiquiti U-Fiber Instant SFP module 



Commit fd580c98 ("net: sfp: augment SFP parsing with
phy_interface_t bitmap") did not add augumentation for the interface
bitmap in the quirk for Ubiquiti U-Fiber Instant.

The subsequent commit f81fa96d ("net: phylink: use
phy_interface_t bitmaps for optical modules") then changed phylink code
for selection of SFP interface: instead of using link mode bitmap, the
interface bitmap is used, and the fastest interface mode supported by
both SFP module and MAC is chosen.

Since the interface bitmap contains also modes faster than 1000base-x,
this caused a regression wherein this module stopped working
out-of-the-box.

Fix this.

Fixes: fd580c98 ("net: sfp: augment SFP parsing with phy_interface_t bitmap")
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20260129082227.17443-1-kabel@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 31a7a0bb

drivers/net/phy/sfp.c

+2 −0
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id, 
	linkmode_zero(caps->link_modes);

	linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,

			 caps->link_modes);

	phy_interface_zero(caps->interfaces);

	__set_bit(PHY_INTERFACE_MODE_1000BASEX, caps->interfaces);

}



#define SFP_QUIRK(_v, _p, _s, _f) \