Commit 385ef48f authored by Christian Marangi's avatar Christian Marangi Committed by David S. Miller

net: phy: add support for scanning PHY in PHY packages nodes

Add support for scanning PHY in PHY package nodes. PHY packages nodes
are just container for actual PHY on the MDIO bus.

Their PHY address defined in the PHY package node are absolute and
reflect the address on the MDIO bus.

mdio_bus.c and of_mdio.c is updated to now support and parse also
PHY package subnode by checking if the node name match
"ethernet-phy-package".

As PHY package reg is mandatory and each PHY in the PHY package must
have a reg, every invalid PHY Package node is ignored and will be
skipped by the autoscan fallback.
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8453c88c
...@@ -139,6 +139,53 @@ bool of_mdiobus_child_is_phy(struct device_node *child) ...@@ -139,6 +139,53 @@ bool of_mdiobus_child_is_phy(struct device_node *child)
} }
EXPORT_SYMBOL(of_mdiobus_child_is_phy); EXPORT_SYMBOL(of_mdiobus_child_is_phy);
static int __of_mdiobus_parse_phys(struct mii_bus *mdio, struct device_node *np,
bool *scanphys)
{
struct device_node *child;
int addr, rc = 0;
/* Loop over the child nodes and register a phy_device for each phy */
for_each_available_child_of_node(np, child) {
if (of_node_name_eq(child, "ethernet-phy-package")) {
/* Ignore invalid ethernet-phy-package node */
if (!of_property_present(child, "reg"))
continue;
rc = __of_mdiobus_parse_phys(mdio, child, NULL);
if (rc && rc != -ENODEV)
goto exit;
continue;
}
addr = of_mdio_parse_addr(&mdio->dev, child);
if (addr < 0) {
/* Skip scanning for invalid ethernet-phy-package node */
if (scanphys)
*scanphys = true;
continue;
}
if (of_mdiobus_child_is_phy(child))
rc = of_mdiobus_register_phy(mdio, child, addr);
else
rc = of_mdiobus_register_device(mdio, child, addr);
if (rc == -ENODEV)
dev_err(&mdio->dev,
"MDIO device at address %d is missing.\n",
addr);
else if (rc)
goto exit;
}
return 0;
exit:
of_node_put(child);
return rc;
}
/** /**
* __of_mdiobus_register - Register mii_bus and create PHYs from the device tree * __of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* @mdio: pointer to mii_bus structure * @mdio: pointer to mii_bus structure
...@@ -180,33 +227,18 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np, ...@@ -180,33 +227,18 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
return rc; return rc;
/* Loop over the child nodes and register a phy_device for each phy */ /* Loop over the child nodes and register a phy_device for each phy */
for_each_available_child_of_node(np, child) { rc = __of_mdiobus_parse_phys(mdio, np, &scanphys);
addr = of_mdio_parse_addr(&mdio->dev, child); if (rc)
if (addr < 0) {
scanphys = true;
continue;
}
if (of_mdiobus_child_is_phy(child))
rc = of_mdiobus_register_phy(mdio, child, addr);
else
rc = of_mdiobus_register_device(mdio, child, addr);
if (rc == -ENODEV)
dev_err(&mdio->dev,
"MDIO device at address %d is missing.\n",
addr);
else if (rc)
goto unregister; goto unregister;
}
if (!scanphys) if (!scanphys)
return 0; return 0;
/* auto scan for PHYs with empty reg property */ /* auto scan for PHYs with empty reg property */
for_each_available_child_of_node(np, child) { for_each_available_child_of_node(np, child) {
/* Skip PHYs with reg property set */ /* Skip PHYs with reg property set or ethernet-phy-package node */
if (of_property_present(child, "reg")) if (of_property_present(child, "reg") ||
of_node_name_eq(child, "ethernet-phy-package"))
continue; continue;
for (addr = 0; addr < PHY_MAX_ADDR; addr++) { for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
...@@ -227,15 +259,16 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np, ...@@ -227,15 +259,16 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
if (!rc) if (!rc)
break; break;
if (rc != -ENODEV) if (rc != -ENODEV)
goto unregister; goto put_unregister;
} }
} }
} }
return 0; return 0;
unregister: put_unregister:
of_node_put(child); of_node_put(child);
unregister:
mdiobus_unregister(mdio); mdiobus_unregister(mdio);
return rc; return rc;
} }
......
...@@ -459,19 +459,34 @@ EXPORT_SYMBOL(of_mdio_find_bus); ...@@ -459,19 +459,34 @@ EXPORT_SYMBOL(of_mdio_find_bus);
* found, set the of_node pointer for the mdio device. This allows * found, set the of_node pointer for the mdio device. This allows
* auto-probed phy devices to be supplied with information passed in * auto-probed phy devices to be supplied with information passed in
* via DT. * via DT.
* If a PHY package is found, PHY is searched also there.
*/ */
static void of_mdiobus_link_mdiodev(struct mii_bus *bus, static int of_mdiobus_find_phy(struct device *dev, struct mdio_device *mdiodev,
struct mdio_device *mdiodev) struct device_node *np)
{ {
struct device *dev = &mdiodev->dev;
struct device_node *child; struct device_node *child;
if (dev->of_node || !bus->dev.of_node) for_each_available_child_of_node(np, child) {
return;
for_each_available_child_of_node(bus->dev.of_node, child) {
int addr; int addr;
if (of_node_name_eq(child, "ethernet-phy-package")) {
/* Validate PHY package reg presence */
if (!of_property_present(child, "reg")) {
of_node_put(child);
return -EINVAL;
}
if (!of_mdiobus_find_phy(dev, mdiodev, child)) {
/* The refcount for the PHY package will be
* incremented later when PHY join the Package.
*/
of_node_put(child);
return 0;
}
continue;
}
addr = of_mdio_parse_addr(dev, child); addr = of_mdio_parse_addr(dev, child);
if (addr < 0) if (addr < 0)
continue; continue;
...@@ -481,9 +496,22 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus, ...@@ -481,9 +496,22 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus,
/* The refcount on "child" is passed to the mdio /* The refcount on "child" is passed to the mdio
* device. Do _not_ use of_node_put(child) here. * device. Do _not_ use of_node_put(child) here.
*/ */
return; return 0;
} }
} }
return -ENODEV;
}
static void of_mdiobus_link_mdiodev(struct mii_bus *bus,
struct mdio_device *mdiodev)
{
struct device *dev = &mdiodev->dev;
if (dev->of_node || !bus->dev.of_node)
return;
of_mdiobus_find_phy(dev, mdiodev, bus->dev.of_node);
} }
#else /* !IS_ENABLED(CONFIG_OF_MDIO) */ #else /* !IS_ENABLED(CONFIG_OF_MDIO) */
static inline void of_mdiobus_link_mdiodev(struct mii_bus *mdio, static inline void of_mdiobus_link_mdiodev(struct mii_bus *mdio,
......
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