Subject: RE: [PATCH][RESEND] net: fec: Fix PHY init after phy_reset_after_clk_enable() [Klartext]

From: Christoph Niedermaier <[email-masked]>
Date: Tue, 6 Oct 2020 19:07:14 +0000

From: Marek Vasut <[email-masked]>
Sent: Tuesday, October 6, 2020 3:53 PM

> The phy_reset_after_clk_enable() does a PHY reset, which means the PHY
> loses its register settings. The fec_enet_mii_probe() starts the PHY
> and does the necessary calls to configure the PHY via PHY framework,
> and loads the correct register settings into the PHY. Therefore,
> fec_enet_mii_probe() should be called only after the PHY has been
> reset, not before as it is now.
> 
> Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support")
> Reviewed-by: Andrew Lunn <[email-masked]>
> Tested-by: Richard Leitner <[email-masked]>
> Signed-off-by: Marek Vasut <[email-masked]>
> Cc: Christoph Niedermaier <[email-masked]>
> Cc: David S. Miller <[email-masked]>
> Cc: NXP Linux Team <[email-masked]>
> Cc: Richard Leitner <[email-masked]>
> Cc: Shawn Guo <[email-masked]>
> ---
>  drivers/net/ethernet/freescale/fec_main.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index c043afb38b6e..2d5433301843 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -2983,17 +2983,17 @@ fec_enet_open(struct net_device *ndev)
>         /* Init MAC prior to mii bus probe */
>         fec_restart(ndev);
> 
> -       /* Probe and connect to PHY when open the interface */
> -       ret = fec_enet_mii_probe(ndev);
> -       if (ret)
> -               goto err_enet_mii_probe;
> -
>         /* Call phy_reset_after_clk_enable() again if it failed during
>          * phy_reset_after_clk_enable() before because the PHY wasn't
> probed.
>          */
>         if (reset_again)
>                 phy_reset_after_clk_enable(ndev->phydev);
> 
> +       /* Probe and connect to PHY when open the interface */
> +       ret = fec_enet_mii_probe(ndev);
> +       if (ret)
> +               goto err_enet_mii_probe;
> +
>         if (fep->quirks & FEC_QUIRK_ERR006687)
>                 imx6q_cpuidle_fec_irqs_used();
> 
> --
> 2.28.0

Tested-by: Christoph Niedermaier <[email-masked]>