Patch "net: stmmac: check if MAC needs to attach to a PHY" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    net: stmmac: check if MAC needs to attach to a PHY

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-stmmac-check-if-mac-needs-to-attach-to-a-phy.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 56fdcffec86f460b2061205d7e83f8d6ba18e2ce
Author: Michael Sit Wei Hong <michael.wei.hong.sit@xxxxxxxxx>
Date:   Thu Mar 30 17:14:03 2023 +0800

    net: stmmac: check if MAC needs to attach to a PHY
    
    [ Upstream commit fe2cfbc9680356a3d9f8adde8a38e715831e32f5 ]
    
    After the introduction of the fixed-link support, the MAC driver
    no longer attempt to scan for a PHY to attach to. This causes the
    non fixed-link setups to stop working.
    
    Using the phylink_expects_phy() to check and determine if the MAC
    should expect and attach a PHY.
    
    Fixes: ab21cf920928 ("net: stmmac: make mdio register skips PHY scanning for fixed-link")
    Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@xxxxxxxxx>
    Signed-off-by: Lai Peter Jun Ann <peter.jun.ann.lai@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 93321437f0933..3a5abfb1a890f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1133,6 +1133,7 @@ static int stmmac_init_phy(struct net_device *dev)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
 	struct fwnode_handle *fwnode;
+	bool phy_needed;
 	int ret;
 
 	fwnode = of_fwnode_handle(priv->plat->phylink_node);
@@ -1142,10 +1143,11 @@ static int stmmac_init_phy(struct net_device *dev)
 	if (fwnode)
 		ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
 
+	phy_needed = phylink_expects_phy(priv->phylink);
 	/* Some DT bindings do not set-up the PHY handle. Let's try to
 	 * manually parse it
 	 */
-	if (!fwnode || ret) {
+	if (!fwnode || phy_needed || ret) {
 		int addr = priv->plat->phy_addr;
 		struct phy_device *phydev;