On 9/8/2021 6:39 PM, Andrew Lunn wrote:
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -1286,6 +1286,17 @@ static int dsa_switch_parse_of(struct
dsa_switch *ds, struct device_node *dn)
{
int err;
+ /* A lot of switch devices have their PHYs as child devices and have
+ * the PHYs depend on the switch as a supplier (Eg: interrupt
+ * controller). With fw_devlink=on, that means the PHYs will defer
+ * probe until the probe() of the switch completes. However, the way
+ * the DSA framework is designed, the PHYs are expected to be probed
+ * successfully before the probe() of the switch completes.
+ *
+ * So, mark the switch devices as a "broken parent" so that fw_devlink
+ * knows not to create device links between PHYs and the parent switch.
+ */
+ np->fwnode.flags |= FWNODE_FLAG_BROKEN_PARENT;
err = dsa_switch_parse_member_of(ds, dn);
if (err)
return err;
This does not work. First off, its dn, not np. But with that fixed, it
still does not work. This is too late, the mdio busses have already
been registered and probed, the PHYs have been found on the busses,
and the PHYs would of been probed, if not for fw_devlink.
What did work was:
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index c45ca2473743..45d67d50e35f 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6249,8 +6249,10 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
if (!np && !pdata)
return -EINVAL;
- if (np)
+ if (np) {
compat_info = of_device_get_match_data(dev);
+ np->fwnode.flags |= FWNODE_FLAG_BROKEN_PARENT;
+ }
if (pdata) {
compat_info = pdata_device_get_match_data(dev);
This will fix it for mv88e6xxx. But if the same problem occurs in any
of the other DSA drivers, they will still be broken:
~/linux/drivers/net/dsa$ grep -r mdiobus_register *
bcm_sf2.c: err = mdiobus_register(priv->slave_mii_bus);
dsa_loop_bdinfo.c: return mdiobus_register_board_info(&bdinfo, 1);
lantiq_gswip.c: return of_mdiobus_register(ds->slave_mii_bus, mdio_np);
mt7530.c: ret = mdiobus_register(bus);
mv88e6xxx/chip.c: err = of_mdiobus_register(bus, np);
grep: mv88e6xxx/chip.o: binary file matches
ocelot/seville_vsc9953.c: rc = mdiobus_register(bus);
ocelot/felix_vsc9959.c: rc = mdiobus_register(bus);
qca/ar9331.c: ret = of_mdiobus_register(mbus, mnp);
qca8k.c: return devm_of_mdiobus_register(priv->dev, bus, mdio);
realtek-smi-core.c: ret = of_mdiobus_register(smi->slave_mii_bus, mdio_np);
sja1105/sja1105_mdio.c: rc = of_mdiobus_register(bus, np);
sja1105/sja1105_mdio.c: rc = of_mdiobus_register(bus, np);
sja1105/sja1105_mdio.c: rc = mdiobus_register(bus);
sja1105/sja1105_mdio.c:int sja1105_mdiobus_register(struct dsa_switch *ds)
sja1105/sja1105.h:int sja1105_mdiobus_register(struct dsa_switch *ds);
sja1105/sja1105_main.c: rc = sja1105_mdiobus_register(ds);
If you are happy to use a big hammer:
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 53f034fc2ef7..7ecd910f7fb8 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -525,6 +525,9 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
NULL == bus->read || NULL == bus->write)
return -EINVAL;
+ if (bus->parent && bus->parent->of_node)
+ bus->parent->of_node->fwnode.flags |= FWNODE_FLAG_BROKEN_PARENT;
+
BUG_ON(bus->state != MDIOBUS_ALLOCATED &&
bus->state != MDIOBUS_UNREGISTERED);
So basically saying all MDIO busses potentially have a problem.
I also don't like the name FWNODE_FLAG_BROKEN_PARENT. The parents are
not broken, they work fine, if fw_devlink gets out of the way and
allows them to do their job.
You also asked about why the component framework is not used. DSA has
been around for a while, the first commit dates back to October
2008. Russell Kings first commit for the component framework is
January 2014. The plain driver model has worked for the last 13 years,
so there has not been any need to change.
That part of the story is more complicated than that, DSA did not get
any development from 2008 till 2014 when I picked it up to add support
for Broadcom switches. In 2016, in order to support more switches,
especially those that were "pure" MDIO devices, Andrew came up with the
mdio_device structure and also created "dsa2" which allowed registering
switches from their actual bus. This allowed us to depart from all of
the limitations of the unique "dsa" platform device which was just
horrible to work with.
I recall very clearly that one of your prototypes that I tested was
using the component framework, although I do not remember why we did not
pursue that route and instead the DSA switch tree got reference counted
and got its current form. So Andrew, you did evaluate the component
framework but ended up not using it, do you remember why?
There is nothing wrong with the current approach of allowing switches to
come up and do the final tree setup when the tree is fully resolved. If
there are driver level changes that we can make to ease the pain on the
device link framework, we should certainly entertain them, keep in mind
that DSA for better or worse shows a lot of cargo cult programming.
--
Florian
