[PATCH v3 18/31] net: phy: Use the compatibility driver attachment API
From: Leon Romanovsky
Date: Wed Nov 18 2026 - 14:34:50 EST
From: Leon Romanovsky <leonro@xxxxxxxxxx>
The generic PHY fallback probes directly before publishing its binding.
Device trust admission needs to precede that probe without changing the
caller's serialization, so use device_driver_attach_unrestricted()
to serialize the generic attachment.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/net/phy/phy_device.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 5d4508bcfbe99..4f20b451e270d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1857,7 +1857,6 @@ static void phy_detach_internal(struct phy_device *phydev, bool notify_bus)
/* The release below lets phy_probe() write this field. */
phydev->irq = phydev->mdio.bus->irq[phydev->mdio.addr];
device_release_driver(&phydev->mdio.dev);
- phydev->is_genphy_driven = 0;
}
/* Assert the reset signal */
@@ -1912,6 +1911,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
struct device *d = &phydev->mdio.dev;
struct module *ndev_owner = NULL;
struct module *drv_owner;
+ struct device_driver *drv;
+ bool bind_genphy;
int irq = phydev->irq;
int err;
@@ -1939,16 +1940,16 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
/* Assume that if there is no driver, that it doesn't
* exist, and we should use the genphy driver.
*/
- if (!d->driver) {
+ drv = d->driver;
+ bind_genphy = !drv;
+ if (bind_genphy) {
if (phydev->is_c45)
- d->driver = &genphy_c45_driver.mdiodrv.driver;
+ drv = &genphy_c45_driver.mdiodrv.driver;
else
- d->driver = &genphy_driver.mdiodrv.driver;
-
- phydev->is_genphy_driven = 1;
+ drv = &genphy_driver.mdiodrv.driver;
}
- drv_owner = d->driver->owner;
+ drv_owner = drv->owner;
if (!try_module_get(drv_owner)) {
phydev_err(phydev, "failed to get the device driver module\n");
err = -EIO;
@@ -1956,11 +1957,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
}
phydev->drv_owner = drv_owner;
- if (phydev->is_genphy_driven) {
- err = d->driver->probe(d);
- if (err >= 0)
- err = device_bind_driver(d);
-
+ if (bind_genphy) {
+ err = device_driver_attach_unrestricted(drv, d);
if (err)
goto error_module_put;
}
@@ -2071,8 +2069,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
module_put(phydev->drv_owner);
phydev->drv_owner = NULL;
phydev->irq = irq;
- phydev->is_genphy_driven = 0;
- d->driver = NULL;
error_put_device:
put_device(d);
if (ndev_owner != bus->owner)
@@ -3813,6 +3809,8 @@ static int phy_probe(struct device *dev)
int err = 0;
phydev->drv = phydrv;
+ phydev->is_genphy_driven = phydrv == &genphy_driver ||
+ phydrv == &genphy_c45_driver;
/* Disable the interrupt if the PHY doesn't support it
* but the interrupt is still a valid one
@@ -3949,6 +3947,7 @@ static int phy_probe(struct device *dev)
out_reset:
/* Re-assert the reset signal on error */
phy_device_reset(phydev, 1);
+ phydev->is_genphy_driven = 0;
return err;
}
@@ -3977,6 +3976,7 @@ static int phy_remove(struct device *dev)
phy_device_reset(phydev, 1);
phydev->drv = NULL;
+ phydev->is_genphy_driven = 0;
return 0;
}
--
2.56.1