Skip to contentSkip to conversation

Patch "net: phy: relax error checking when creating sysfs link netdev->phydev" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 28, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

    net: phy: relax error checking when creating sysfs link netdev->phydev

to the 4.14-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-phy-relax-error-checking-when-creating-sysfs-link-netdev-phydev.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Mar 28 18:38:30 CEST 2018

From: Grygorii Strashko <[email protected]>
Date: Fri, 16 Mar 2018 17:08:35 -0500
Subject: net: phy: relax error checking when creating sysfs link netdev->phydev

From: Grygorii Strashko <[email protected]>

[ Upstream commit 4414b3ed74be0e205e04e12cd83542a727d88255 ]

Some ethernet drivers (like TI CPSW) may connect and manage >1 Net PHYs per one netdevice, as result such drivers will produce warning during system boot and fail to connect second phy to netdevice when PHYLIB framework will try to create sysfs link netdev->phydev for second PHY
in phy_attach_direct(), because sysfs link with the same name has been created already for the first PHY. As result, second CPSW external port will became unusable.

Fix it by relaxing error checking when PHYLIB framework is creating sysfs link netdev->phydev in phy_attach_direct(), suppressing warning by using sysfs_create_link_nowarn() and adding error message instead. After this change links (phy->netdev and netdev->phy) creation failure is not fatal any more and system can continue working, which fixes TI CPSW issue.

Cc Florian Fainelli <[email protected]>
Cc Andrew Lunn <[email protected]>
Fixes a3995460491d ("net: phy: Relax error checking on sysfs_create_link()")
---
 drivers/net/phy/phy_device.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/phy/phy_device.c +11 -4
@@ -999,10 +999,17 @@ int phy_attach_direct(struct net_device
 	err = sysfs_create_link(&phydev->mdio.dev.kobj, &dev->dev.kobj,
 				"attached_dev");
 	if (!err) {
-		err = sysfs_create_link(&dev->dev.kobj, &phydev->mdio.dev.kobj,
-					"phydev");
-		if (err)
-			goto error;
+		err = sysfs_create_link_nowarn(&dev->dev.kobj,
+					       &phydev->mdio.dev.kobj,
+					       "phydev");
+		if (err) {
+			dev_err(&dev->dev, "could not add device link to %s err %d\n",
+				kobject_name(&phydev->mdio.dev.kobj),
+				err);
+			/* non-fatal - some net drivers can use one netdevice
+			 * with more then one phy
+			 */
+		}
 
 		phydev->sysfs_links = true;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/sysfs-symlink-export-sysfs_create_link_nowarn.patch queue-4.14/net-ethernet-ti-cpsw-add-check-for-in-band-mode-setting-with-rgmii-phy-interface.patch queue-4.14/net-phy-relax-error-checking-when-creating-sysfs-link-netdev-phydev.patch