Skip to content

Commit 0d288f9

Browse files
sch-mjfvogel
authored andcommitted
net: sfp: add quirk for FS SFP-10GM-T copper SFP+ module
[ Upstream commit 05ec5c085eb7ae044d49e04a3cff194a0b2a3251 ] Add quirk for a copper SFP that identifies itself as "FS" "SFP-10GM-T". It uses RollBall protocol to talk to the PHY and needs 4 sec wait before probing the PHY. Signed-off-by: Martin Schiller <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 163e8c1083b41289aad2afd06c39b9f859dc4ec0) Signed-off-by: Jack Vogel <[email protected]>
1 parent 64def50 commit 0d288f9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/net/phy/sfp.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static void sfp_fixup_rollball(struct sfp *sfp)
385385
sfp->phy_t_retry = msecs_to_jiffies(1000);
386386
}
387387

388-
static void sfp_fixup_fs_2_5gt(struct sfp *sfp)
388+
static void sfp_fixup_rollball_wait4s(struct sfp *sfp)
389389
{
390390
sfp_fixup_rollball(sfp);
391391

@@ -399,7 +399,7 @@ static void sfp_fixup_fs_2_5gt(struct sfp *sfp)
399399
static void sfp_fixup_fs_10gt(struct sfp *sfp)
400400
{
401401
sfp_fixup_10gbaset_30m(sfp);
402-
sfp_fixup_fs_2_5gt(sfp);
402+
sfp_fixup_rollball_wait4s(sfp);
403403
}
404404

405405
static void sfp_fixup_halny_gsfp(struct sfp *sfp)
@@ -479,9 +479,10 @@ static const struct sfp_quirk sfp_quirks[] = {
479479
// PHY.
480480
SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),
481481

482-
// Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the PHY and
483-
// needs 4 sec wait before probing the PHY.
484-
SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt),
482+
// Fiberstore SFP-2.5G-T and SFP-10GM-T uses Rollball protocol to talk
483+
// to the PHY and needs 4 sec wait before probing the PHY.
484+
SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_rollball_wait4s),
485+
SFP_QUIRK_F("FS", "SFP-10GM-T", sfp_fixup_rollball_wait4s),
485486

486487
// Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd
487488
// NRZ in their EEPROM

0 commit comments

Comments
 (0)