netdev - [PATCH] net: phy: shift phy_init_hw after device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 4 Apr 2014 16:38:48 +0300
From:	Grygorii Strashko <grygorii.strashko@...com>
To:	Florian Fainelli <f.fainelli@...il.com>, <netdev@...r.kernel.org>
CC:	Grygorii Strashko <grygorii.strashko@...com>
Subject: [PATCH] net: phy: shift phy_init_hw after device_add during phy device registration

Now the call of phy_init_hw() in phy_device_register() is converted to
be just a NOP, because phy_init_hw() is called before PHY devices probing
and phydev->drv == NULL at this moment.

phy_device_register()
 |- phy_init_hw() -> NOP
 |- device_add()
    |- phy_probe() -> may be if driver is ready
       |- phydev->drv = <&phy_driver>

Hence, shift call of phy_init_hw() after device_add() and in such way
increase possibility of its execution.

This patch is RFC because:
- this patch will change PHY's callbacks call order: .config_init() will
be called after .probe()
- i'm not sure that phy_init_hw() need to be called from phy_device_register() and
maybe it can be moved in other place, like phy_probe()

Signed-off-by: Grygorii Strashko <grygorii.strashko@...com>
---
 drivers/net/phy/phy_device.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 2f6989b..496940be 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -352,16 +352,16 @@ int phy_device_register(struct phy_device *phydev)
 		return -EINVAL;
 	phydev->bus->phy_map[phydev->addr] = phydev;
 
-	/* Run all of the fixups for this PHY */
-	err = phy_init_hw(phydev);
+	err = device_add(&phydev->dev);
 	if (err) {
-		pr_err("PHY %d failed to initialize\n", phydev->addr);
+		pr_err("PHY %d failed to add\n", phydev->addr);
 		goto out;
 	}
 
-	err = device_add(&phydev->dev);
+	/* Run all of the fixups for this PHY */
+	err = phy_init_hw(phydev);
 	if (err) {
-		pr_err("PHY %d failed to add\n", phydev->addr);
+		pr_err("PHY %d failed to initialize\n", phydev->addr);
 		goto out;
 	}
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html