net: mii_timestamper: fix static allocation by PHY driver

If phydev->mii_ts is set by the PHY driver, it will always be
overwritten in of_mdiobus_register_phy(). Fix it. Also make sure, that
the unregister() doesn't do anything if the mii_timestamper was provided by
the PHY driver.

Fixes: 1dca22b18421 ("net: mdio: of: Register discovered MII time stampers.")
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/mii_timestamper.c b/drivers/net/phy/mii_timestamper.c
index 2f12c5d901df605b6ad436d3c1f6287b4c4e264a..b71b7456462d10af347e7ba7dc9d538ead69bc64 100644 (file)
--- a/drivers/net/phy/mii_timestamper.c
+++ b/drivers/net/phy/mii_timestamper.c
@@ -111,6 +111,13 @@ void unregister_mii_timestamper(struct mii_timestamper *mii_ts)
        struct mii_timestamping_desc *desc;
        struct list_head *this;
 
+       /* mii_timestamper statically registered by the PHY driver won't use the
+        * register_mii_timestamper() and thus don't have ->device set. Don't
+        * try to unregister these.
+        */
+       if (!mii_ts->device)
+               return;
+
        mutex_lock(&tstamping_devices_lock);
        list_for_each(this, &mii_timestamping_devices) {
                desc = list_entry(this, struct mii_timestamping_desc, list);

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index db0ed5879803f4c50b748a413905464c8db00ca6..8270bbf505fbe4d873b7a67d17ffc07daeac3da6 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -124,7 +124,13 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
                of_node_put(child);
                return rc;
        }
-       phy->mii_ts = mii_ts;
+
+       /* phy->mii_ts may already be defined by the PHY driver. A
+        * mii_timestamper probed via the device tree will still have
+        * precedence.
+        */
+       if (mii_ts)
+               phy->mii_ts = mii_ts;
 
        dev_dbg(&mdio->dev, "registered phy %pOFn at address %i\n",
                child, addr);