Commit f27bc8af authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Priyanka Jain
Browse files

net: phy: fixed: Be compatible with live OF tree

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 nasty hack since its introduction in
commit db40c1aa ("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 unfort...
parent 33aad0b0
......@@ -17,13 +17,23 @@ DECLARE_GLOBAL_DATA_PTR;
int fixedphy_probe(struct phy_device *phydev)
{
/* fixed-link phy must not be reset by core phy code */
phydev->flags |= PHY_FLAG_BROKEN_RESET;
return 0;
}
int fixedphy_config(struct phy_device *phydev)
{
ofnode node = phy_get_ofnode(phydev);
struct fixed_link *priv;
int ofnode = phydev->addr;
u32 val;
if (!ofnode_valid(node))
return -EINVAL;
/* check for mandatory properties within fixed-link node */
val = fdt_getprop_u32_default_node(gd->fdt_blob,
ofnode, 0, "speed", 0);
val = ofnode_read_u32_default(node, "speed", 0);
if (val != SPEED_10 && val != SPEED_100 && val != SPEED_1000 &&
val != SPEED_2500 && val != SPEED_10000) {
printf("ERROR: no/invalid speed given in fixed-link node!");
......@@ -38,12 +48,9 @@ int fixedphy_probe(struct phy_device *phydev)
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");
/* fixed-link phy must not be reset by core phy code */
phydev->flags |= PHY_FLAG_BROKEN_RESET;
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;
}
......@@ -72,6 +79,7 @@ static struct phy_driver fixedphy_driver = {
.name = "Fixed PHY",
.features = PHY_GBIT_FEATURES | SUPPORTED_MII,
.probe = fixedphy_probe,
.config = fixedphy_config,
.startup = fixedphy_startup,
.shutdown = fixedphy_shutdown,
};
......
......@@ -988,6 +988,7 @@ static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus,
struct phy_device *fixed_phy_create(ofnode node)
{
phy_interface_t interface = PHY_INTERFACE_MODE_NONE;
struct phy_device *phydev;
const char *if_str;
ofnode subnode;
......@@ -1004,8 +1005,11 @@ struct phy_device *fixed_phy_create(ofnode node)
return NULL;
}
return phy_device_create(NULL, ofnode_to_offset(subnode), PHY_FIXED_ID,
false, interface);
phydev = phy_device_create(NULL, 0, PHY_FIXED_ID, false, interface);
if (phydev)
phydev->node = subnode;
return phydev;
}
#ifdef CONFIG_DM_ETH
......@@ -1018,20 +1022,16 @@ static struct phy_device *phy_connect_fixed(struct mii_dev *bus,
phy_interface_t interface)
#endif
{
struct phy_device *phydev = NULL;
int sn;
const char *name;
ofnode node = dev_ofnode(dev), subnode;
struct phy_device *phydev;
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);
}
subnode = ofnode_find_subnode(node, "fixed-link");
if (!ofnode_valid(subnode))
return NULL;
phydev = phy_device_create(bus, 0, PHY_FIXED_ID, false, interface);
if (phydev)
phydev->node = subnode;
return phydev;
}
......
......@@ -138,11 +138,13 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev,
struct udevice *mdiodev;
struct phy_device *phy;
struct ofnode_phandle_args phandle = {.node = ofnode_null()};
ofnode phynode;
int i;
if (CONFIG_IS_ENABLED(PHY_FIXED) &&
ofnode_phy_is_fixed_link(dev_ofnode(ethdev), NULL)) {
phy = phy_connect(NULL, -1, ethdev, interface);
ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) {
phy = phy_connect(NULL, 0, ethdev, interface);
phandle.node = phynode;
goto out;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment