Re: [PATCH net-next] net: sfp: add quirk for FS SFP-10GM-T copper SFP+ module

From: Martin Schiller
Date: Wed Feb 26 2025 - 11:06:15 EST


On 2025-02-26 16:26, Kory Maincent wrote:
On Wed, 26 Feb 2025 15:50:46 +0100
Martin Schiller <ms@xxxxxxxxxx> wrote:

On 2025-02-26 15:38, Russell King (Oracle) wrote:
> On Wed, Feb 26, 2025 at 03:10:02PM +0100, Martin Schiller wrote:
>> 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 <ms@xxxxxxxxxx>
>> ---
>> drivers/net/phy/sfp.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
>> index 9369f5297769..15284be4c38c 100644
>> --- a/drivers/net/phy/sfp.c
>> +++ b/drivers/net/phy/sfp.c
>> @@ -479,9 +479,10 @@ static const struct sfp_quirk sfp_quirks[] = {
>> // PHY.
>> SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),
>>
>> - // Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the
>> PHY and
>> - // needs 4 sec wait before probing the PHY.
>> + // Fiberstore SFP-2.5G-T and SFP-10GM-T uses Rollball protocol to
>> talk
>> + // to the PHY and needs 4 sec wait before probing the PHY.
>> SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt),
>> + SFP_QUIRK_F("FS", "SFP-10GM-T", sfp_fixup_fs_2_5gt),
>
> Which makes sfp_fixup_fs_2_5gt mis-named. Please rename.

OK, I'll rename it to sfp_fixup_rollball_wait.

I would prefer sfp_fixup_fs_rollball_wait to keep the name of the manufacturer.
It can't be a generic fixup as other FSP could have other waiting time values
like the Turris RTSFP-10G which needs 25s.

I think you're getting two things mixed up.
The phy still has 25 seconds to wake up. With sfp_fixup_rollball_wait
there simply is an additional 4s wait at the beginning before we start
searching for a phy.