Re: [PATCH v4 2/3] phy: handle optional regulator for PHY

[Andrew Lunn]

On Tue, Nov 15, 2022 at 07:36:02AM +0000, Corentin Labbe wrote:
> Add handling of optional regulators for PHY.
> Regulators need to be enabled before PHY scanning, so MDIO bus
> initiate this task.
>
> Signed-off-by: Corentin Labbe <cla...@baylibre.com>
> ---
> drivers/net/mdio/fwnode_mdio.c | 31 ++++++++++++++++++++++++++++++-
> drivers/net/phy/phy_device.c | 10 ++++++++++
> include/linux/phy.h | 3 +++
> 3 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
> index 689e728345ce..19a16072d4ca 100644
> --- a/drivers/net/mdio/fwnode_mdio.c
> +++ b/drivers/net/mdio/fwnode_mdio.c
> @@ -10,6 +10,7 @@
> #include <linux/fwnode_mdio.h>
> #include <linux/of.h>
> #include <linux/phy.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/pse-pd/pse.h>

These headers are sorted, so please add regulator after pse.

>
> MODULE_AUTHOR("Calvin Johnson <calvin....@oss.nxp.com>");
> @@ -116,7 +117,9 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,
> struct phy_device *phy;
> bool is_c45 = false;
> u32 phy_id;
> - int rc;
> + int rc, reg_cnt = 0;
> + struct regulator_bulk_data *consumers = NULL;
> + struct device_node __maybe_unused *nchild = NULL;

Reverse Christmas tree.

>
> psec = fwnode_find_pse_control(child);
> if (IS_ERR(psec))
> @@ -133,6 +136,26 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,
> if (rc >= 0)
> is_c45 = true;
>
> +#ifdef CONFIG_OF

Do you need this #ifdef ? Generally, all of_* functions should have
stubs if CONFIG_OF is not enabled. It would be nice to remove this, so
we get compile testing. And the __maybe_unused above is then probably
not needed.

> + for_each_child_of_node(bus->dev.of_node, nchild) {
> + u32 reg;
> +
> + of_property_read_u32(nchild, "reg", &reg);
> + if (reg != addr)
> + continue;
> + reg_cnt = of_regulator_bulk_get_all(&bus->dev, nchild, &consumers);
> + if (reg_cnt > 0) {
> + rc = regulator_bulk_enable(reg_cnt, consumers);
> + if (rc)
> + return rc;
> + }
> + if (reg_cnt < 0) {
> + dev_err(&bus->dev, "Fail to regulator_bulk_get_all err=%d\n", reg_cnt);
> + return reg_cnt;
> + }
> + }
> +#endif
> +

Andrew

[Andrew Lunn]

> + reg_cnt = of_regulator_bulk_get_all(&bus->dev, nchild, &consumers);

This allocates memory for consumers?

I don't see it being freed. I think you need to add to
phy_remove. Plus the error patch should also free it.

Andrew