Unify the handling of reset properties for an `mdio_device`. Replace mdiobus_register_gpiod() and mdiobus_register_reset() with mdio_device_register_reset() and mdio_device_unregister_reset(), and move them from mdio_bus.c to mdio_device.c, where they belong. The new functions handle both reset-controllers and reset-gpios, and also read the corresponding firmware properties from the device tree, which were previously handled in fwnode_mdio.c. This makes tracking the reset properties easier. The reset logic is unaltered, and should work as it did before. Signed-off-by: Buday Csaba --- V4 -> V5: - fixed possible leak in mdio_device_register_reset() if both a reset-gpio and a reset-controller are present. - fixed whitespace - updated commit message V3 -> V4: unmodified V2 -> V3: fixed kernel-doc warnings V1 -> V2: changed the return value of mdio_device_unregister_reset() to void --- drivers/net/mdio/fwnode_mdio.c | 5 ---- drivers/net/phy/mdio_bus.c | 39 ++----------------------- drivers/net/phy/mdio_device.c | 53 ++++++++++++++++++++++++++++++++++ include/linux/mdio.h | 2 ++ 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 9b41d4697..ba7091518 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -92,11 +92,6 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, if (fwnode_property_read_bool(child, "broken-turn-around")) mdio->phy_ignore_ta_mask |= 1 << addr; - fwnode_property_read_u32(child, "reset-assert-us", - &phy->mdio.reset_assert_delay); - fwnode_property_read_u32(child, "reset-deassert-us", - &phy->mdio.reset_deassert_delay); - /* Associate the fwnode with the device structure so it * can be looked up later */ diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index cad6ed3aa..cc3f9cfb1 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -33,33 +33,6 @@ #define CREATE_TRACE_POINTS #include -static int mdiobus_register_gpiod(struct mdio_device *mdiodev) -{ - /* Deassert the optional reset signal */ - mdiodev->reset_gpio = gpiod_get_optional(&mdiodev->dev, - "reset", GPIOD_OUT_LOW); - if (IS_ERR(mdiodev->reset_gpio)) - return PTR_ERR(mdiodev->reset_gpio); - - if (mdiodev->reset_gpio) - gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset"); - - return 0; -} - -static int mdiobus_register_reset(struct mdio_device *mdiodev) -{ - struct reset_control *reset; - - reset = reset_control_get_optional_exclusive(&mdiodev->dev, "phy"); - if (IS_ERR(reset)) - return PTR_ERR(reset); - - mdiodev->reset_ctrl = reset; - - return 0; -} - int mdiobus_register_device(struct mdio_device *mdiodev) { int err; @@ -68,16 +41,9 @@ int mdiobus_register_device(struct mdio_device *mdiodev) return -EBUSY; if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) { - err = mdiobus_register_gpiod(mdiodev); + err = mdio_device_register_reset(mdiodev); if (err) return err; - - err = mdiobus_register_reset(mdiodev); - if (err) - return err; - - /* Assert the reset signal */ - mdio_device_reset(mdiodev, 1); } mdiodev->bus->mdio_map[mdiodev->addr] = mdiodev; @@ -91,8 +57,7 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev) if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev) return -EINVAL; - gpiod_put(mdiodev->reset_gpio); - reset_control_put(mdiodev->reset_ctrl); + mdio_device_unregister_reset(mdiodev); mdiodev->bus->mdio_map[mdiodev->addr] = NULL; diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index f64176e0e..b56a75ee3 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -74,6 +74,59 @@ struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr) } EXPORT_SYMBOL(mdio_device_create); +/** + * mdio_device_register_reset - Read and initialize the reset properties of + * an mdio device + * @mdiodev: mdio_device structure + * + * Return: Zero if successful, negative error code on failure + */ +int mdio_device_register_reset(struct mdio_device *mdiodev) +{ + struct reset_control *reset; + + /* Read optional firmware properties */ + fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-assert-us", + &mdiodev->reset_assert_delay); + fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-deassert-us", + &mdiodev->reset_deassert_delay); + + /* reset-gpio, bring up deasserted */ + mdiodev->reset_gpio = gpiod_get_optional(&mdiodev->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(mdiodev->reset_gpio)) + return PTR_ERR(mdiodev->reset_gpio); + + if (mdiodev->reset_gpio) + gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset"); + + reset = reset_control_get_optional_exclusive(&mdiodev->dev, "phy"); + if (IS_ERR(reset)) { + gpiod_put(mdiodev->reset_gpio); + return PTR_ERR(reset); + } + + mdiodev->reset_ctrl = reset; + + /* Assert the reset signal */ + mdio_device_reset(mdiodev, 1); + + return 0; +} +EXPORT_SYMBOL(mdio_device_register_reset); + +/** + * mdio_device_unregister_reset - uninitialize the reset properties of + * an mdio device + * @mdiodev: mdio_device structure + */ +void mdio_device_unregister_reset(struct mdio_device *mdiodev) +{ + gpiod_put(mdiodev->reset_gpio); + reset_control_put(mdiodev->reset_ctrl); +} +EXPORT_SYMBOL(mdio_device_unregister_reset); + /** * mdio_device_register - Register the mdio device on the MDIO bus * @mdiodev: mdio_device structure to be added to the MDIO bus diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 42d6d47e4..d81b63fc7 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -90,6 +90,8 @@ static inline void *mdiodev_get_drvdata(struct mdio_device *mdio) void mdio_device_free(struct mdio_device *mdiodev); struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); +int mdio_device_register_reset(struct mdio_device *mdiodev); +void mdio_device_unregister_reset(struct mdio_device *mdiodev); int mdio_device_register(struct mdio_device *mdiodev); void mdio_device_remove(struct mdio_device *mdiodev); void mdio_device_reset(struct mdio_device *mdiodev, int value); -- 2.39.5 Change fwnode_property_read_u32() in mdio_device_register_reset() to device_property_read_u32(), which is more appropriate here. Signed-off-by: Buday Csaba --- V4 -> V5: tweaked commit message V3 -> V4: unmodified V2 -> V3: unmodified V1 -> V2: added new patch based on maintainer request --- drivers/net/phy/mdio_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index b56a75ee3..e24bce474 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -86,9 +86,9 @@ int mdio_device_register_reset(struct mdio_device *mdiodev) struct reset_control *reset; /* Read optional firmware properties */ - fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-assert-us", + device_property_read_u32(&mdiodev->dev, "reset-assert-us", &mdiodev->reset_assert_delay); - fwnode_property_read_u32(dev_fwnode(&mdiodev->dev), "reset-deassert-us", + device_property_read_u32(&mdiodev->dev, "reset-deassert-us", &mdiodev->reset_deassert_delay); /* reset-gpio, bring up deasserted */ -- 2.39.5 When the ID of an Ethernet PHY is not provided by the 'compatible' string in the device tree, its actual ID is read via the MDIO bus. For some PHYs this could be unsafe, since a hard reset may be necessary to safely access the MDIO registers. Add a fallback mechanism for these devices: when reading the ID fails, the reset will be asserted, and the ID read is retried. Signed-off-by: Buday Csaba --- V4 -> V5: - when fwnode_reset_phy() returns with -EPROBE_DEFER, that error is now propagated upstream instead of being discarded. - info message removed (it will be a separate commit) - 'err' variable changed to 'rc' in fwnode_reset_phy() - removed last fwnode_handle_put() in fwnode_reset_phy() The cleanup is performed by mdio_device_free(). V3 -> V4: dropped DT property `phy-id-read-needs-reset` to control the reset behaviour, asserting reset as a fallback mechanism instead. Added info level message for resetting. V2 -> V3: kernel-doc replaced with a comment (fixed warning) V1 -> V2: - renamed fwnode_reset_phy_before_probe() to fwnode_reset_phy() - added kernel-doc for fwnode_reset_phy() - improved error handling in fwnode_reset_phy() --- drivers/net/mdio/fwnode_mdio.c | 38 +++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index ba7091518..9669da2b7 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -114,6 +114,34 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, } EXPORT_SYMBOL(fwnode_mdiobus_phy_device_register); +/* Hard-reset a PHY before registration */ +static int fwnode_reset_phy(struct mii_bus *bus, u32 addr, + struct fwnode_handle *phy_node) +{ + struct mdio_device *tmpdev; + int rc; + + tmpdev = mdio_device_create(bus, addr); + if (IS_ERR(tmpdev)) + return PTR_ERR(tmpdev); + + fwnode_handle_get(phy_node); + device_set_node(&tmpdev->dev, phy_node); + rc = mdio_device_register_reset(tmpdev); + if (rc) { + mdio_device_free(tmpdev); + return rc; + } + + mdio_device_reset(tmpdev, 1); + mdio_device_reset(tmpdev, 0); + + mdio_device_unregister_reset(tmpdev); + mdio_device_free(tmpdev); + + return 0; +} + int fwnode_mdiobus_register_phy(struct mii_bus *bus, struct fwnode_handle *child, u32 addr) { @@ -129,8 +157,16 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, return PTR_ERR(mii_ts); is_c45 = fwnode_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"); - if (is_c45 || fwnode_get_phy_id(child, &phy_id)) + if (is_c45 || fwnode_get_phy_id(child, &phy_id)) { phy = get_phy_device(bus, addr, is_c45); + if (IS_ERR(phy)) { + rc = fwnode_reset_phy(bus, addr, child); + if (rc == -EPROBE_DEFER) + goto clean_mii_ts; + else if (!rc) + phy = get_phy_device(bus, addr, is_c45); + } + } else phy = phy_device_create(bus, addr, phy_id, 0, NULL); if (IS_ERR(phy)) { -- 2.39.5 Add an info level message when resetting a PHY before registration. Signed-off-by: Buday Csaba --- V4 -> V5: moved the info message to a separate commit --- drivers/net/mdio/fwnode_mdio.c | 9 +++++++-- drivers/net/phy/mdio_device.c | 13 +++++++++++++ include/linux/mdio.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 9669da2b7..d753ebd37 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -133,8 +133,13 @@ static int fwnode_reset_phy(struct mii_bus *bus, u32 addr, return rc; } - mdio_device_reset(tmpdev, 1); - mdio_device_reset(tmpdev, 0); + if (mdio_device_has_reset(tmpdev)) { + dev_info(&bus->dev, + "PHY device at address %d not detected, resetting PHY.\n", + addr); + mdio_device_reset(tmpdev, 1); + mdio_device_reset(tmpdev, 0); + } mdio_device_unregister_reset(tmpdev); mdio_device_free(tmpdev); diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index e24bce474..f2cbcb6bb 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -171,6 +171,19 @@ void mdio_device_remove(struct mdio_device *mdiodev) } EXPORT_SYMBOL(mdio_device_remove); +/** + * mdio_device_has_reset - Check if an MDIO device has reset properties defined + * @mdiodev: mdio_device structure + * + * Return: non-zero if the device has a reset GPIO or reset controller, + * zero otherwise. + */ +int mdio_device_has_reset(struct mdio_device *mdiodev) +{ + return (mdiodev->reset_gpio || mdiodev->reset_ctrl); +} +EXPORT_SYMBOL(mdio_device_has_reset); + void mdio_device_reset(struct mdio_device *mdiodev, int value) { unsigned int d; diff --git a/include/linux/mdio.h b/include/linux/mdio.h index d81b63fc7..83cfc051e 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -92,6 +92,7 @@ void mdio_device_free(struct mdio_device *mdiodev); struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); int mdio_device_register_reset(struct mdio_device *mdiodev); void mdio_device_unregister_reset(struct mdio_device *mdiodev); +int mdio_device_has_reset(struct mdio_device *mdiodev); int mdio_device_register(struct mdio_device *mdiodev); void mdio_device_remove(struct mdio_device *mdiodev); void mdio_device_reset(struct mdio_device *mdiodev, int value); -- 2.39.5