mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
129f2e50f1
Some checks failed
OpenWrt-CI / Build OpenWrt Firmware (push) Failing after 6s
This fixes the handling of some FS copper SFP modules using the RollBall protocol and needing some extra treatment. Signed-off-by: Martin Schiller <ms@dev.tdt.de>
86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
From e9301af385e7864dea353f5e58cad7339dd6c718 Mon Sep 17 00:00:00 2001
|
|
From: Marek Behún <kabel@kernel.org>
|
|
Date: Tue, 19 Dec 2023 17:24:15 +0100
|
|
Subject: net: sfp: fix PHY discovery for FS SFP-10G-T module
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 2f3ce7a56c6e ("net: sfp: rework the RollBall PHY waiting code")
|
|
changed the long wait before accessing RollBall / FS modules into
|
|
probing for PHY every 1 second, and trying 25 times.
|
|
|
|
Wei Lei reports that this does not work correctly on FS modules: when
|
|
initializing, they may report values different from 0xffff in PHY ID
|
|
registers for some MMDs, causing get_phy_c45_ids() to find some bogus
|
|
MMD.
|
|
|
|
Fix this by adding the module_t_wait member back, and setting it to 4
|
|
seconds for FS modules.
|
|
|
|
Fixes: 2f3ce7a56c6e ("net: sfp: rework the RollBall PHY waiting code")
|
|
Reported-by: Wei Lei <quic_leiwei@quicinc.com>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Tested-by: Lei Wei <quic_leiwei@quicinc.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/sfp.c | 17 +++++++++++++----
|
|
1 file changed, 13 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp.c
|
|
+++ b/drivers/net/phy/sfp.c
|
|
@@ -273,6 +273,7 @@ struct sfp {
|
|
struct sfp_eeprom_id id;
|
|
unsigned int module_power_mW;
|
|
unsigned int module_t_start_up;
|
|
+ unsigned int module_t_wait;
|
|
unsigned int phy_t_retry;
|
|
|
|
unsigned int rate_kbd;
|
|
@@ -373,6 +374,12 @@ static void sfp_fixup_fs_10gt(struct sfp
|
|
{
|
|
sfp_fixup_10gbaset_30m(sfp);
|
|
sfp_fixup_rollball(sfp);
|
|
+
|
|
+ /* The RollBall fixup is not enough for FS modules, the AQR 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_halny_gsfp(struct sfp *sfp)
|
|
@@ -2317,6 +2324,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
|
mask |= SFP_F_RS1;
|
|
|
|
sfp->module_t_start_up = T_START_UP;
|
|
+ sfp->module_t_wait = T_WAIT;
|
|
sfp->phy_t_retry = T_PHY_RETRY;
|
|
|
|
sfp->tx_fault_ignore = false;
|
|
@@ -2551,9 +2559,10 @@ static void sfp_sm_main(struct sfp *sfp,
|
|
|
|
/* We need to check the TX_FAULT state, which is not defined
|
|
* while TX_DISABLE is asserted. The earliest we want to do
|
|
- * anything (such as probe for a PHY) is 50ms.
|
|
+ * anything (such as probe for a PHY) is 50ms (or more on
|
|
+ * specific modules).
|
|
*/
|
|
- sfp_sm_next(sfp, SFP_S_WAIT, T_WAIT);
|
|
+ sfp_sm_next(sfp, SFP_S_WAIT, sfp->module_t_wait);
|
|
break;
|
|
|
|
case SFP_S_WAIT:
|
|
@@ -2567,8 +2576,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
|
* deasserting.
|
|
*/
|
|
timeout = sfp->module_t_start_up;
|
|
- if (timeout > T_WAIT)
|
|
- timeout -= T_WAIT;
|
|
+ if (timeout > sfp->module_t_wait)
|
|
+ timeout -= sfp->module_t_wait;
|
|
else
|
|
timeout = 1;
|
|
|