[Linux-stm32] [PATCH net 1/2] net: stmmac: fix PHY handle parsing

[Piotr Raczynski]

On Mon, Mar 13, 2023 at 04:01:34PM +0800, Michael Sit Wei Hong wrote:
> phylink_fwnode_phy_connect returns 0 when set to MLO_AN_INBAND.
> This causes the PHY handle parsing to skip and the PHY will not be attached
> to the MAC.
> 
> Add additional check for PHY handle parsing when set to MLO_AN_INBAND.
> 
> Fixes: ab21cf920928 ("net: stmmac: make mdio register skips PHY scanning for fixed-link")
> Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit at intel.com>
> Signed-off-by: Lai Peter Jun Ann <peter.jun.ann.lai at intel.com>
> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8f543c3ab5c5..398adcd68ee8 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1134,6 +1134,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
>  static int stmmac_init_phy(struct net_device *dev)
>  {
>  	struct stmmac_priv *priv = netdev_priv(dev);
> +	struct fwnode_handle *fixed_node;
>  	struct fwnode_handle *fwnode;
>  	int ret;
>  
> @@ -1141,13 +1142,16 @@ static int stmmac_init_phy(struct net_device *dev)
>  	if (!fwnode)
>  		fwnode = dev_fwnode(priv->device);
>  
> -	if (fwnode)
> +	if (fwnode) {
> +		fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link");
> +		fwnode_handle_put(fixed_node);
>  		ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
> +	}
>  

On the occasion, why not rewrite above to:
if (!fwnode)
...
else
...

or:
if(fwnode)
...
else
?

>  	/* Some DT bindings do not set-up the PHY handle. Let's try to
>  	 * manually parse it
>  	 */
> -	if (!fwnode || ret) {
> +	if (!fwnode || ret || !fixed_node) {
>  		int addr = priv->plat->phy_addr;
>  		struct phy_device *phydev;
>  
> -- 
> 2.34.1
>