From: Vladimir Oltean vladimir.oltean@nxp.com
On systems that use CONFIG_OF_LIVE, the "ofnode" type is defined as const struct device_node *np, while on the flat DT systems it is defined as a long of_offset into gd->fdt_blob.
It is desirable that the fixed PHY driver uses the higher-level ofnode abstraction instead of parsing gd->fdt_blob directly, because that enables it to work on live OF systems.
The fixed PHY driver has used a nastyyyyy hack since its introduction in commit db40c1aa1c10 ("drivers/net/phy: add fixed-phy / fixed-link support"), which is to pass the long gd->fdt_blob offset inside int phydev->addr (a value that normally holds the MDIO bus address at which the PHY responds). Even ignoring the fact that the types were already mismatched leading to a potential truncation (flat OF offset was supposed to be a long and not an int), we really cannot extend this hack any longer, because there's no way an int will hold the other representation of ofnode, the struct device_node *np.
So we unfortunately need to do the right thing, which is to use the framework introduced by Grygorii Strashko in commit eef0b8a930d1 ("net: phy: add ofnode node to struct phy_device"). This will populate phydev->node for the fixed PHY.
Note that phydev->node will not be valid in the probe function, since that is called synchronously from phy_device_create and we really have no way of passing the ofnode directly through the phy_device_create API. So we do what other drivers do too: we move the OF parsing logic from the .probe to the .config method of the PHY driver.
Signed-off-by: Vladimir Oltean vladimir.oltean@nxp.com --- Changes in v5: Patch is new.
drivers/net/phy/fixed.c | 31 ++++++++++++++++++++++--------- drivers/net/phy/phy.c | 24 ++++++++++++++---------- 2 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 3228672fc4ae..d117a50719a2 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -15,15 +15,16 @@
DECLARE_GLOBAL_DATA_PTR;
-int fixedphy_probe(struct phy_device *phydev) +static int fixedphy_of_init(struct phy_device *phydev) { + ofnode node = phy_get_ofnode(phydev); struct fixed_link *priv; - int ofnode = phydev->addr; u32 val;
- /* check for mandatory properties within fixed-link node */ - val = fdt_getprop_u32_default_node(gd->fdt_blob, - ofnode, 0, "speed", 0); + if (!ofnode_valid(node)) + return -EINVAL; + + val = ofnode_read_u32_default(node, "speed", 0); if (val != SPEED_10 && val != SPEED_100 && val != SPEED_1000) { printf("ERROR: no/invalid speed given in fixed-link node!"); return -EINVAL; @@ -32,14 +33,26 @@ int fixedphy_probe(struct phy_device *phydev) priv = malloc(sizeof(*priv)); if (!priv) return -ENOMEM; + memset(priv, 0, sizeof(*priv));
phydev->priv = priv;
priv->link_speed = val; - priv->duplex = fdtdec_get_bool(gd->fdt_blob, ofnode, "full-duplex"); - priv->pause = fdtdec_get_bool(gd->fdt_blob, ofnode, "pause"); - priv->asym_pause = fdtdec_get_bool(gd->fdt_blob, ofnode, "asym-pause"); + priv->duplex = ofnode_read_bool(node, "full-duplex"); + priv->pause = ofnode_read_bool(node, "pause"); + priv->asym_pause = ofnode_read_bool(node, "asym-pause"); + + return 0; +} + +static int fixedphy_config(struct phy_device *phydev) +{ + int err; + + err = fixedphy_of_init(phydev); + if (err) + return err;
/* fixed-link phy must not be reset by core phy code */ phydev->flags |= PHY_FLAG_BROKEN_RESET; @@ -70,7 +83,7 @@ static struct phy_driver fixedphy_driver = { .mask = 0xffffffff, .name = "Fixed PHY", .features = PHY_GBIT_FEATURES | SUPPORTED_MII, - .probe = fixedphy_probe, + .config = fixedphy_config, .startup = fixedphy_startup, .shutdown = fixedphy_shutdown, }; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a2be3987364c..e88c93c4180d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -987,19 +987,23 @@ static struct phy_device *phy_connect_fixed(struct mii_dev *bus, phy_interface_t interface) #endif { + ofnode node = dev_ofnode(dev), subnode; struct phy_device *phydev = NULL; - int sn; const char *name;
- sn = fdt_first_subnode(gd->fdt_blob, dev_of_offset(dev)); - while (sn > 0) { - name = fdt_get_name(gd->fdt_blob, sn, NULL); - if (name && strcmp(name, "fixed-link") == 0) { - phydev = phy_device_create(bus, sn, PHY_FIXED_ID, false, - interface); - break; - } - sn = fdt_next_subnode(gd->fdt_blob, sn); + for (subnode = ofnode_first_subnode(node); ofnode_valid(subnode); + subnode = ofnode_next_subnode(node)) { + name = ofnode_get_name(subnode); + + if (!name || strcmp(name, "fixed-link") != 0) + continue; + + phydev = phy_device_create(bus, 0, PHY_FIXED_ID, false, + interface); + if (phydev) + phydev->node = subnode; + + break; }
return phydev;