mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-16 12:36:59 +07:00
Merge branch 'phy-relax-error-checking'
Grygorii Strashko says: ==================== net: phy: relax error checking when creating sysfs link netdev->phydev 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. This regression was introduced by commits:5568363f0c
("net: phy: Create sysfs reciprocal links for attached_dev/phydev"a399546049
("net: phy: Relax error checking on sysfs_create_link()" Patch 1: exports sysfs_create_link_nowarn() function as preparation for Patch 2. Patch 2: relaxes error checking when PHYLIB framework is creating sysfs link netdev->phydev in phy_attach_direct(), suppresses warning by using sysfs_create_link_nowarn() and adds error message instead, so links creation failure is not fatal any more and system can continue working, which fixes TI CPSW issue and makes boot logs accessible in case of NFS boot, for example. This can be stable material 4.13+. Changes in v2: - commit messages updated. v1: https://patchwork.ozlabs.org/cover/886058/ ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
36fe095606
@ -1012,10 +1012,17 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
||||
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;
|
||||
}
|
||||
|
@ -106,6 +106,7 @@ int sysfs_create_link_nowarn(struct kobject *kobj, struct kobject *target,
|
||||
{
|
||||
return sysfs_do_create_link(kobj, target, name, 0);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sysfs_create_link_nowarn);
|
||||
|
||||
/**
|
||||
* sysfs_delete_link - remove symlink in object's directory.
|
||||
|
Loading…
Reference in New Issue
Block a user