[PATCH net] net: sparx5: fix error handling in sparx5_port_open()

[Steen Hegelund]

Hi Liu,

Thanks for your patch, the changes look good to me.  We also did a round of
testing on the platform, simulating errors to see this in effect.

On Thu, 2022-11-17 at 20:59 +0800, Liu Jian wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the
> content is safe
> 
> If phylink_of_phy_connect() fails, the port should be disabled.
> If sparx5_serdes_set()/phy_power_on() fails, the port should be
> disabled and the phylink should be stopped and disconnected.
> 
> Fixes: 946e7fd5053a ("net: sparx5: add port module support")
> Fixes: f3cad2611a77 ("net: sparx5: add hostmode with phylink support")
> Signed-off-by: Liu Jian <liujian56 at huawei.com>
> ---
>  .../net/ethernet/microchip/sparx5/sparx5_netdev.c  | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
> b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
> index 19516ccad533..d078156581d5 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
> @@ -104,7 +104,7 @@ static int sparx5_port_open(struct net_device *ndev)
>         err = phylink_of_phy_connect(port->phylink, port->of_node, 0);
>         if (err) {
>                 netdev_err(ndev, "Could not attach to PHY\n");
> -               return err;
> +               goto err_connect;
>         }
> 
>         phylink_start(port->phylink);
> @@ -116,10 +116,20 @@ static int sparx5_port_open(struct net_device *ndev)
>                         err = sparx5_serdes_set(port->sparx5, port, &port-
> >conf);
>                 else
>                         err = phy_power_on(port->serdes);
> -               if (err)
> +               if (err) {
>                         netdev_err(ndev, "%s failed\n", __func__);
> +                       goto out_power;
> +               }
>         }
> 
> +       return 0;
> +
> +out_power:
> +       phylink_stop(port->phylink);
> +       phylink_disconnect_phy(port->phylink);
> +err_connect:
> +       sparx5_port_enable(port, false);
> +
>         return err;
>  }
> 
> --
> 2.17.1
> 

Tested-off-by: Bjarni Jonasson <bjarni.jonasson at microchip.com>
Reviewed-off-by: Lars Povlsen <steen.hegelund at microchip.com>

BR
Steen