netdev - Re: [PATCH net-next] net: sfp: fix PHY discovery for FS SFP-10G-T module

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <78b23ab0-f05b-49e4-8ca5-60b16a1cb8ea@quicinc.com>
Date: Wed, 20 Dec 2023 16:30:08 +0800
From: Lei Wei <quic_leiwei@...cinc.com>
To: Marek Behún <kabel@...nel.org>, <netdev@...r.kernel.org>,
        Russell King <rmk+kernel@...linux.org.uk>
CC: Jakub Kicinski <kuba@...nel.org>, Andrew Lunn <andrew@...n.ch>
Subject: Re: [PATCH net-next] net: sfp: fix PHY discovery for FS SFP-10G-T
 module



On 12/20/2023 12:24 AM, Marek Behún wrote:
> 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@...cinc.com>
> Signed-off-by: Marek Behún <kabel@...nel.org>
Tested-by: Lei Wei <quic_leiwei@...cinc.com>

Regards,
Lei Wei
> ---
> Lei, could you please test this and send a Tested-by tag?
Marek, verified it is working, thank you for the fix.
> ---
>   drivers/net/phy/sfp.c | 17 +++++++++++++----
>   1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 3780a96d2caa..f75c9eb3958e 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -274,6 +274,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;
> @@ -388,6 +389,12 @@ static void sfp_fixup_fs_10gt(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
> +	 * 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)
> @@ -2329,6 +2336,7 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
>   		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->state_ignore_mask = 0;
> @@ -2566,9 +2574,10 @@ static void sfp_sm_main(struct sfp *sfp, unsigned int event)
>   
>   		/* 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:
> @@ -2582,8 +2591,8 @@ static void sfp_sm_main(struct sfp *sfp, unsigned int event)
>   			 * 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;
>