Skip to content

Commit bc66fa8

Browse files
xiaoleiwang123456kuba-moo
authored andcommitted
net: phy: Add link between phy dev and mac dev
If the external phy used by current mac interface is managed by another mac interface, it means that this network port cannot work independently, especially when the system suspends and resumes, the following trace may appear, so we should create a device link between phy dev and mac dev. WARNING: CPU: 0 PID: 24 at drivers/net/phy/phy.c:983 phy_error+0x20/0x68 Modules linked in: CPU: 0 PID: 24 Comm: kworker/0:2 Not tainted 6.1.0-rc3-00011-g5aaef24b5c6d-dirty #34 Hardware name: Freescale i.MX6 SoloX (Device Tree) Workqueue: events_power_efficient phy_state_machine unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x68/0x90 dump_stack_lvl from __warn+0xb4/0x24c __warn from warn_slowpath_fmt+0x5c/0xd8 warn_slowpath_fmt from phy_error+0x20/0x68 phy_error from phy_state_machine+0x22c/0x23c phy_state_machine from process_one_work+0x288/0x744 process_one_work from worker_thread+0x3c/0x500 worker_thread from kthread+0xf0/0x114 kthread from ret_from_fork+0x14/0x28 Exception stack(0xf0951fb0 to 0xf0951ff8) Signed-off-by: Xiaolei Wang <[email protected]> Tested-by: Florian Fainelli <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 281f820 commit bc66fa8

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

drivers/net/phy/phy_device.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,15 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
15121512
phy_resume(phydev);
15131513
phy_led_triggers_register(phydev);
15141514

1515+
/**
1516+
* If the external phy used by current mac interface is managed by
1517+
* another mac interface, so we should create a device link between
1518+
* phy dev and mac dev.
1519+
*/
1520+
if (phydev->mdio.bus->parent && dev->dev.parent != phydev->mdio.bus->parent)
1521+
phydev->devlink = device_link_add(dev->dev.parent, &phydev->mdio.dev,
1522+
DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
1523+
15151524
return err;
15161525

15171526
error:
@@ -1750,6 +1759,9 @@ void phy_detach(struct phy_device *phydev)
17501759
struct module *ndev_owner = NULL;
17511760
struct mii_bus *bus;
17521761

1762+
if (phydev->devlink)
1763+
device_link_del(phydev->devlink);
1764+
17531765
if (phydev->sysfs_links) {
17541766
if (dev)
17551767
sysfs_remove_link(&dev->dev.kobj, "phydev");

include/linux/phy.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,8 @@ struct macsec_ops;
529529
*
530530
* @mdio: MDIO bus this PHY is on
531531
* @drv: Pointer to the driver for this PHY instance
532+
* @devlink: Create a link between phy dev and mac dev, if the external phy
533+
* used by current mac interface is managed by another mac interface.
532534
* @phy_id: UID for this device found during discovery
533535
* @c45_ids: 802.3-c45 Device Identifiers if is_c45.
534536
* @is_c45: Set to true if this PHY uses clause 45 addressing.
@@ -618,6 +620,8 @@ struct phy_device {
618620
/* And management functions */
619621
struct phy_driver *drv;
620622

623+
struct device_link *devlink;
624+
621625
u32 phy_id;
622626

623627
struct phy_c45_device_ids c45_ids;

0 commit comments

Comments
 (0)