Skip to content

Commit 08f1a20

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: bcm_sf2: don't use devres for mdiobus
As explained in commits: 74b6d7d ("net: dsa: realtek: register the MDIO bus under devres") 5135e96 ("net: dsa: don't allocate the slave_mii_bus using devres") mdiobus_free() will panic when called from devm_mdiobus_free() <- devres_release_all() <- __device_release_driver(), and that mdiobus was not previously unregistered. The Starfighter 2 is a platform device, so the initial set of constraints that I thought would cause this (I2C or SPI buses which call ->remove on ->shutdown) do not apply. But there is one more which applies here. If the DSA master itself is on a bus that calls ->remove from ->shutdown (like dpaa2-eth, which is on the fsl-mc bus), there is a device link between the switch and the DSA master, and device_links_unbind_consumers() will unbind the bcm_sf2 switch driver on shutdown. So the same treatment must be applied to all DSA switch drivers, which is: either use devres for both the mdiobus allocation and registration, or don't use devres at all. The bcm_sf2 driver has the code structure in place for orderly mdiobus removal, so just replace devm_mdiobus_alloc() with the non-devres variant, and add manual free where necessary, to ensure that we don't let devres free a still-registered bus. Fixes: ac3a68d ("net: phy: don't abuse devres in devm_mdiobus_register()") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 50facd8 commit 08f1a20

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/net/dsa/bcm_sf2.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
621621
get_device(&priv->master_mii_bus->dev);
622622
priv->master_mii_dn = dn;
623623

624-
priv->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
624+
priv->slave_mii_bus = mdiobus_alloc();
625625
if (!priv->slave_mii_bus) {
626626
of_node_put(dn);
627627
return -ENOMEM;
@@ -681,15 +681,18 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
681681
}
682682

683683
err = mdiobus_register(priv->slave_mii_bus);
684-
if (err && dn)
684+
if (err && dn) {
685+
mdiobus_free(priv->slave_mii_bus);
685686
of_node_put(dn);
687+
}
686688

687689
return err;
688690
}
689691

690692
static void bcm_sf2_mdio_unregister(struct bcm_sf2_priv *priv)
691693
{
692694
mdiobus_unregister(priv->slave_mii_bus);
695+
mdiobus_free(priv->slave_mii_bus);
693696
of_node_put(priv->master_mii_dn);
694697
}
695698

0 commit comments

Comments
 (0)