[PATCH net-next v2 1/2] net: sfp: update comment for FS SFP-10G-T quirk

[PATCH net-next v2 1/2] net: sfp: update comment for FS SFP-10G-T quirk

[Marek Behún]

Update the comment for the Fibrestore SFP-10G-T module: since commit
e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
we also do a 4 second wait before probing the PHY.

Fixes: e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
Since this only fixes a comment and the next patch is based on this one,
I am sending to net-next instead of net.
---
 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 6e7639fc64dd..1af15f2da8a6 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -468,8 +468,9 @@ static const struct sfp_quirk sfp_quirks[] = {
 	SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
 		  sfp_fixup_nokia),
 
-	// Fiberstore SFP-10G-T doesn't identify as copper, and uses the
-	// Rollball protocol to talk to the PHY.
+	// Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball
+	// protocol to talk to the PHY and needs 4 sec wait before probing the
+	// PHY.
 	SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),
 
 	// Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd
-- 
2.43.2

[PATCH net-next v2 2/2] net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module

[Marek Behún]

Enhance the quirk for Fibrestore 2.5G copper SFP module. The original
commit e27aca3760c0 ("net: sfp: add quirk for FS's 2.5G copper SFP")
introducing the quirk says that the PHY is inaccessible, but that is
not true.

The module uses Rollball protocol to talk to the PHY, and needs a 4
second wait before probing it, same as FS 10G module.

The PHY inside the module is Realtek RTL8221B-VB-CG PHY. The realtek
driver recently gained support to set it up via clause 45 accesses.

Signed-off-by: Marek Behún <kabel@kernel.org>
---
This patch depends on realtek driver changes merged in
  c31bd5b6ff6f ("Merge branch 'rtl8226b-serdes-switching'")
which are currently only in net-next.
---
 drivers/net/phy/sfp.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 1af15f2da8a6..7d063cd3c6af 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -385,18 +385,23 @@ static void sfp_fixup_rollball(struct sfp *sfp)
 	sfp->phy_t_retry = msecs_to_jiffies(1000);
 }
 
-static void sfp_fixup_fs_10gt(struct sfp *sfp)
+static void sfp_fixup_fs_2_5gt(struct sfp *sfp)
 {
-	sfp_fixup_10gbaset_30m(sfp);
 	sfp_fixup_rollball(sfp);
 
-	/* The RollBall fixup is not enough for FS modules, the AQR chip inside
+	/* The RollBall fixup is not enough for FS modules, the PHY chip inside
 	 * them does not return 0xffff for PHY ID registers in all MMDs for the
 	 * while initializing. They need a 4 second wait before accessing PHY.
 	 */
 	sfp->module_t_wait = msecs_to_jiffies(4000);
 }
 
+static void sfp_fixup_fs_10gt(struct sfp *sfp)
+{
+	sfp_fixup_10gbaset_30m(sfp);
+	sfp_fixup_fs_2_5gt(sfp);
+}
+
 static void sfp_fixup_halny_gsfp(struct sfp *sfp)
 {
 	/* Ignore the TX_FAULT and LOS signals on this module.
@@ -473,6 +478,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.
+	SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt),
+
 	// Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd
 	// NRZ in their EEPROM
 	SFP_QUIRK("FS", "GPON-ONU-34-20BI", sfp_quirk_2500basex,
@@ -489,9 +498,6 @@ static const struct sfp_quirk sfp_quirks[] = {
 	SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
 		  sfp_fixup_ignore_tx_fault),
 
-	// FS 2.5G Base-T
-	SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
-
 	// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
 	// 2500MBd NRZ in their EEPROM
 	SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),
-- 
2.43.2

Re: [PATCH net-next v2 1/2] net: sfp: update comment for FS SFP-10G-T quirk

[Jiri Pirko]

Tue, Apr 23, 2024 at 10:50:38AM CEST, kabel@kernel.org wrote:
>Update the comment for the Fibrestore SFP-10G-T module: since commit
>e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
>we also do a 4 second wait before probing the PHY.
>
>Fixes: e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
>Signed-off-by: Marek Behún <kabel@kernel.org>
>Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>

For patchsets, could you please next time provide a cover letter. Even
very simple one would do. Thanks!

Re: [PATCH net-next v2 2/2] net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module

[Jiri Pirko]

Tue, Apr 23, 2024 at 10:50:39AM CEST, kabel@kernel.org wrote:
>Enhance the quirk for Fibrestore 2.5G copper SFP module. The original
>commit e27aca3760c0 ("net: sfp: add quirk for FS's 2.5G copper SFP")
>introducing the quirk says that the PHY is inaccessible, but that is
>not true.
>
>The module uses Rollball protocol to talk to the PHY, and needs a 4
>second wait before probing it, same as FS 10G module.
>
>The PHY inside the module is Realtek RTL8221B-VB-CG PHY. The realtek
>driver recently gained support to set it up via clause 45 accesses.
>
>Signed-off-by: Marek Behún <kabel@kernel.org>
>---
>This patch depends on realtek driver changes merged in
>  c31bd5b6ff6f ("Merge branch 'rtl8226b-serdes-switching'")
>which are currently only in net-next.

I don't follow. You are targetting net-next (by patch subject), what's
the point of this comment?

Otherwise looks ok to me.
Reviewed-by: Jiri Pirko <jiri@nvidia.com>

Re: [PATCH net-next v2 2/2] net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module

[Marek Behún]

On Tue, 23 Apr 2024 13:41:33 +0200
Jiri Pirko <jiri@resnulli.us> wrote:

> Tue, Apr 23, 2024 at 10:50:39AM CEST, kabel@kernel.org wrote:
> >Enhance the quirk for Fibrestore 2.5G copper SFP module. The original
> >commit e27aca3760c0 ("net: sfp: add quirk for FS's 2.5G copper SFP")
> >introducing the quirk says that the PHY is inaccessible, but that is
> >not true.
> >
> >The module uses Rollball protocol to talk to the PHY, and needs a 4
> >second wait before probing it, same as FS 10G module.
> >
> >The PHY inside the module is Realtek RTL8221B-VB-CG PHY. The realtek
> >driver recently gained support to set it up via clause 45 accesses.
> >
> >Signed-off-by: Marek Behún <kabel@kernel.org>
> >---
> >This patch depends on realtek driver changes merged in
> >  c31bd5b6ff6f ("Merge branch 'rtl8226b-serdes-switching'")
> >which are currently only in net-next.  
> 
> I don't follow. You are targetting net-next (by patch subject), what's
> the point of this comment?

I wrote that in case someone wanted me to send this to net, instead of
net-next.

Marek

Re: [PATCH net-next v2 1/2] net: sfp: update comment for FS SFP-10G-T quirk

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 23 Apr 2024 10:50:38 +0200 you wrote:
> Update the comment for the Fibrestore SFP-10G-T module: since commit
> e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
> we also do a 4 second wait before probing the PHY.
> 
> Fixes: e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module")
> Signed-off-by: Marek Behún <kabel@kernel.org>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> 
> [...]

Here is the summary with links:
  - [net-next,v2,1/2] net: sfp: update comment for FS SFP-10G-T quirk
    https://git.kernel.org/netdev/net-next/c/6999e0fc9a55
  - [net-next,v2,2/2] net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module
    https://git.kernel.org/netdev/net-next/c/cd4a32e60061

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html