Patch "net: stmmac: check fwnode for phy device before scanning for phy" has been added to the 6.2-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

    net: stmmac: check fwnode for phy device before scanning for phy

to the 6.2-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-fwnode-for-phy-device-before-scanni.patch
and it can be found in the queue-6.2 subdirectory.

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



commit 4ea6a14ebaa0d8b8c99bb265eb2872356dfb8609
Author: Michael Sit Wei Hong <michael.wei.hong.sit@xxxxxxxxx>
Date:   Thu Apr 6 10:45:41 2023 +0800

    net: stmmac: check fwnode for phy device before scanning for phy
    
    [ Upstream commit 8fbc10b995a506e173f1080dfa2764f232a65e02 ]
    
    Some DT devices already have phy device configured in the DT/ACPI.
    Current implementation scans for a phy unconditionally even though
    there is a phy listed in the DT/ACPI and already attached.
    
    We should check the fwnode if there is any phy device listed in
    fwnode and decide whether to scan for a phy to attach to.
    
    Fixes: fe2cfbc96803 ("net: stmmac: check if MAC needs to attach to a PHY")
    Reported-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/lkml/20230403212434.296975-1-martin.blumenstingl@xxxxxxxxxxxxxx/
    Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
    Tested-by: Shahab Vahedi <shahab@xxxxxxxxxxxx>
    Tested-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
    Tested-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
    Suggested-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
    Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20230406024541.3556305-1-michael.wei.hong.sit@xxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    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 4888536a31500..622b95bfb0b2b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1134,22 +1134,26 @@ 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 *phy_fwnode;
 	struct fwnode_handle *fwnode;
-	bool phy_needed;
 	int ret;
 
+	if (!phylink_expects_phy(priv->phylink))
+		return 0;
+
 	fwnode = of_fwnode_handle(priv->plat->phylink_node);
 	if (!fwnode)
 		fwnode = dev_fwnode(priv->device);
 
 	if (fwnode)
-		ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
+		phy_fwnode = fwnode_get_phy_node(fwnode);
+	else
+		phy_fwnode = NULL;
 
-	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 || phy_needed || ret) {
+	if (!phy_fwnode || IS_ERR(phy_fwnode)) {
 		int addr = priv->plat->phy_addr;
 		struct phy_device *phydev;
 
@@ -1165,6 +1169,9 @@ static int stmmac_init_phy(struct net_device *dev)
 		}
 
 		ret = phylink_connect_phy(priv->phylink, phydev);
+	} else {
+		fwnode_handle_put(phy_fwnode);
+		ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
 	}
 
 	if (!priv->plat->pmt) {



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux