Skip to content

Commit 0d120df

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: lantiq_gswip: 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 GSWIP switch 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 GSWIP 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 gswip 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 9ffe3d0 commit 0d120df

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

drivers/net/dsa/lantiq_gswip.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)
498498
static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)
499499
{
500500
struct dsa_switch *ds = priv->ds;
501+
int err;
501502

502-
ds->slave_mii_bus = devm_mdiobus_alloc(priv->dev);
503+
ds->slave_mii_bus = mdiobus_alloc();
503504
if (!ds->slave_mii_bus)
504505
return -ENOMEM;
505506

@@ -512,7 +513,11 @@ static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)
512513
ds->slave_mii_bus->parent = priv->dev;
513514
ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;
514515

515-
return of_mdiobus_register(ds->slave_mii_bus, mdio_np);
516+
err = of_mdiobus_register(ds->slave_mii_bus, mdio_np);
517+
if (err)
518+
mdiobus_free(ds->slave_mii_bus);
519+
520+
return err;
516521
}
517522

518523
static int gswip_pce_table_entry_read(struct gswip_priv *priv,
@@ -2145,8 +2150,10 @@ static int gswip_probe(struct platform_device *pdev)
21452150
gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
21462151
dsa_unregister_switch(priv->ds);
21472152
mdio_bus:
2148-
if (mdio_np)
2153+
if (mdio_np) {
21492154
mdiobus_unregister(priv->ds->slave_mii_bus);
2155+
mdiobus_free(priv->ds->slave_mii_bus);
2156+
}
21502157
put_mdio_node:
21512158
of_node_put(mdio_np);
21522159
for (i = 0; i < priv->num_gphy_fw; i++)
@@ -2169,6 +2176,7 @@ static int gswip_remove(struct platform_device *pdev)
21692176

21702177
if (priv->ds->slave_mii_bus) {
21712178
mdiobus_unregister(priv->ds->slave_mii_bus);
2179+
mdiobus_free(priv->ds->slave_mii_bus);
21722180
of_node_put(priv->ds->slave_mii_bus->dev.of_node);
21732181
}
21742182

0 commit comments

Comments
 (0)