[PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[Marco Felsch]

Document the common phy-supply property to be able to specify a phy
regulator.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changelog:
v4:
- no changes
v3:
- no changes
v2
- add ack-by

 Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index ddf9522a5dc23..847ecb82b37ee 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -160,6 +160,9 @@ properties:
       can be passive (no SW requirement), and requires that the MAC operate
       in a different mode than the PHY in order to function.
 
+  phy-supply:
+    description: PHY regulator
+
   snps,axi-config:
     $ref: /schemas/types.yaml#/definitions/phandle
     description:
-- 
2.39.2

[PATCH net-next v4 2/3] net: stmmac: introduce small helper to check STMMAC_FLAG_USE_PHY_WOL

[Marco Felsch]

Add a convenient helper to make it easier to check the
STMMAC_FLAG_USE_PHY_WOL flag which is useful for the follow up commit.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
Changelog:
v4:
- new patch

 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e7ca52f0d2f2d..add271ec8d801 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6949,6 +6949,11 @@ static void stmmac_service_task(struct work_struct *work)
 	clear_bit(STMMAC_SERVICE_SCHED, &priv->state);
 }
 
+static bool stmmac_use_phy_wol(struct stmmac_priv *priv)
+{
+	return priv->plat->flags & STMMAC_FLAG_USE_PHY_WOL;
+}
+
 /**
  *  stmmac_hw_init - Init the MAC device
  *  @priv: driver private structure
@@ -6983,7 +6988,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 		 */
 		priv->plat->enh_desc = priv->dma_cap.enh_desc;
 		priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up &&
-				!(priv->plat->flags & STMMAC_FLAG_USE_PHY_WOL);
+				!stmmac_use_phy_wol(priv);
 		priv->hw->pmt = priv->plat->pmt;
 		if (priv->dma_cap.hash_tb_sz) {
 			priv->hw->multicast_filter_bins =
-- 
2.39.2

[PATCH net-next v4 3/3] net: stmmac: add support for phy-supply

[Marco Felsch]

Add generic phy-supply handling support to control the phy regulator to
avoid handling it within the glue code. Use the generic stmmac_platform
code to register a possible phy-supply and the stmmac_main code to
handle the power on/off.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
Changelog
v4:
- fix use_phy_wol
- v3-link: https://lore.kernel.org/lkml/20230720072304.3358701-1-m.felsch@pengutronix.de

v3:
- rebased onto net-next/main
- fixed changelog style
- v2-link: https://lore.kernel.org/lkml/20230718132049.3028341-1-m.felsch@pengutronix.de

v2:
- adapt stmmac_phy_power
- move power-on/off into stmmac_main to handle WOL
- adapt commit message
- v1-link: https://lore.kernel.org/lkml/20230717164307.2868264-1-m.felsch@pengutronix.de

 .../net/ethernet/stmicro/stmmac/stmmac_main.c | 58 ++++++++++++++++++-
 .../ethernet/stmicro/stmmac/stmmac_platform.c | 10 ++++
 include/linux/stmmac.h                        |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index add271ec8d801..9ec8964ab3582 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -31,6 +31,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/prefetch.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/regulator/consumer.h>
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
@@ -1128,6 +1129,55 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
 	}
 }
 
+/**
+ * stmmac_phy_power - PHY regulator on/off
+ * @priv: driver private structure
+ * @enable: turn on the regulator if true else turn it off
+ * Enable or disable the regulator powering the PHY.
+ */
+static int stmmac_phy_power(struct stmmac_priv *priv, bool enable)
+{
+	struct regulator *regulator = priv->plat->phy_regulator;
+	struct device *dev = priv->device;
+
+	if (!regulator)
+		return 0;
+
+	if (enable) {
+		int ret;
+
+		ret = regulator_enable(regulator);
+		if (ret)
+			dev_err(dev, "Fail to enable regulator\n");
+
+		return ret;
+	}
+
+	regulator_disable(regulator);
+
+	return 0;
+}
+
+/**
+ * stmmac_phy_power_on - PHY regulator on
+ * @priv: driver private structure
+ * Enable the PHY regulator
+ */
+static int stmmac_phy_power_on(struct stmmac_priv *priv)
+{
+	return stmmac_phy_power(priv, true);
+}
+
+/**
+ * stmmac_phy_power_off - PHY regulator off
+ * @priv: driver private structure
+ * Disable the PHY regulator
+ */
+static void stmmac_phy_power_off(struct stmmac_priv *priv)
+{
+	stmmac_phy_power(priv, false);
+}
+
 /**
  * stmmac_init_phy - PHY initialization
  * @dev: net device structure
@@ -1253,7 +1303,8 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
 		return PTR_ERR(phylink);
 
 	priv->phylink = phylink;
-	return 0;
+
+	return stmmac_phy_power_on(priv);
 }
 
 static void stmmac_display_rx_rings(struct stmmac_priv *priv,
@@ -7593,6 +7644,7 @@ void stmmac_dvr_remove(struct device *dev)
 	if (priv->hw->pcs != STMMAC_PCS_TBI &&
 	    priv->hw->pcs != STMMAC_PCS_RTBI)
 		stmmac_mdio_unregister(ndev);
+	stmmac_phy_power_off(priv);
 	destroy_workqueue(priv->wq);
 	mutex_destroy(&priv->lock);
 	bitmap_free(priv->af_xdp_zc_qps);
@@ -7656,6 +7708,8 @@ int stmmac_suspend(struct device *dev)
 		if (device_may_wakeup(priv->device))
 			phylink_speed_down(priv->phylink, false);
 		phylink_suspend(priv->phylink, false);
+		if (!stmmac_use_phy_wol(priv))
+			stmmac_phy_power_off(priv);
 	}
 	rtnl_unlock();
 
@@ -7738,6 +7792,8 @@ int stmmac_resume(struct device *dev)
 		priv->irq_wake = 0;
 	} else {
 		pinctrl_pm_select_default_state(priv->device);
+		if (!stmmac_use_phy_wol(priv))
+			stmmac_phy_power_on(priv);
 		/* reset the phy so that it's ready */
 		if (priv->mii)
 			stmmac_mdio_reset(priv->mii);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 23d53ea04b24d..18988da4614cd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -424,6 +425,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
 	if (plat->interface < 0)
 		plat->interface = plat->phy_interface;
 
+	/* Optional regulator for PHY */
+	plat->phy_regulator = devm_regulator_get_optional(&pdev->dev, "phy");
+	if (IS_ERR(plat->phy_regulator)) {
+		if (PTR_ERR(plat->phy_regulator) == -EPROBE_DEFER)
+			return ERR_CAST(plat->phy_regulator);
+		dev_info(&pdev->dev, "No regulator found\n");
+		plat->phy_regulator = NULL;
+	}
+
 	/* Some wrapper drivers still rely on phy_node. Let's save it while
 	 * they are not converted to phylink. */
 	plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index ef67dba775d04..b5d2d75de2759 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -222,6 +222,7 @@ struct plat_stmmacenet_data {
 	int phy_addr;
 	int interface;
 	phy_interface_t phy_interface;
+	struct regulator *phy_regulator;
 	struct stmmac_mdio_bus_data *mdio_bus_data;
 	struct device_node *phy_node;
 	struct device_node *phylink_node;
-- 
2.39.2

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[Rob Herring]

On Fri, Jul 21, 2023 at 01:03:43PM +0200, Marco Felsch wrote:
> Document the common phy-supply property to be able to specify a phy
> regulator.

What common property? I don't see any such property in 
ethernet-controller.yaml.

> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> Changelog:
> v4:
> - no changes
> v3:
> - no changes
> v2
> - add ack-by
> 
>  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index ddf9522a5dc23..847ecb82b37ee 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -160,6 +160,9 @@ properties:
>        can be passive (no SW requirement), and requires that the MAC operate
>        in a different mode than the PHY in order to function.
>  
> +  phy-supply:
> +    description: PHY regulator

Is this for an serdes, sgmii, etc. type phy or ethernet phy? Either way, 
this property belongs in the PHY's node because it is the PHY that has 
supply connection. I'm guessing you put this here for the latter case 
because ethernet PHYs on MDIO are "discoverable" except for the small 
problem that powering them on is not discoverable. 

Rob

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[Marco Felsch]

Hi Rob,

On 23-07-21, Rob Herring wrote:
> On Fri, Jul 21, 2023 at 01:03:43PM +0200, Marco Felsch wrote:
> > Document the common phy-supply property to be able to specify a phy
> > regulator.
> 
> What common property? I don't see any such property in 
> ethernet-controller.yaml.

Not in ethernet-controller.yaml but there are at least a few user of
this binding:
 - allwinner,sun4i-a10-mdio.yaml
 - allwinner,sun7i-a20-gmac.yaml
 - allwinner,sun8i-a83t-emac.yaml
 - fsl,fec.yaml
 - rockchip-dwmac.yaml
 - rockchip,emac.yaml

Also there is no <vendor>,phy-supply nor <ip-vendor>,phy-supply,
therefore I thought this is common.

> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > ---
> > Changelog:
> > v4:
> > - no changes
> > v3:
> > - no changes
> > v2
> > - add ack-by
> > 
> >  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > index ddf9522a5dc23..847ecb82b37ee 100644
> > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > @@ -160,6 +160,9 @@ properties:
> >        can be passive (no SW requirement), and requires that the MAC operate
> >        in a different mode than the PHY in order to function.
> >  
> > +  phy-supply:
> > +    description: PHY regulator
> 
> Is this for an serdes, sgmii, etc. type phy or ethernet phy? Either way, 
> this property belongs in the PHY's node because it is the PHY that has 
> supply connection. I'm guessing you put this here for the latter case 
> because ethernet PHYs on MDIO are "discoverable" except for the small 
> problem that powering them on is not discoverable. 

All kind of ethernet phys connected to you etherent MAC which need to be
power controlled by software. You're right this sould belong to the PHY
node (as Krzysztof already mentioned) but this isn't the case yet. As
you can see there are at least 6 user of the exact same binding.

Regards,
  Marco

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[Marco Felsch]

Hi Rob,

On 23-07-24, Marco Felsch wrote:
> Hi Rob,
> 
> On 23-07-21, Rob Herring wrote:
> > On Fri, Jul 21, 2023 at 01:03:43PM +0200, Marco Felsch wrote:
> > > Document the common phy-supply property to be able to specify a phy
> > > regulator.
> > 
> > What common property? I don't see any such property in 
> > ethernet-controller.yaml.
> 
> Not in ethernet-controller.yaml but there are at least a few user of
> this binding:
>  - allwinner,sun4i-a10-mdio.yaml
>  - allwinner,sun7i-a20-gmac.yaml
>  - allwinner,sun8i-a83t-emac.yaml
>  - fsl,fec.yaml
>  - rockchip-dwmac.yaml
>  - rockchip,emac.yaml
> 
> Also there is no <vendor>,phy-supply nor <ip-vendor>,phy-supply,
> therefore I thought this is common.

any further comments else I would like to gentle ping this series.

Regards,
  Marco

> > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > ---
> > > Changelog:
> > > v4:
> > > - no changes
> > > v3:
> > > - no changes
> > > v2
> > > - add ack-by
> > > 
> > >  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
> > >  1 file changed, 3 insertions(+)
> > > 
> > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > > index ddf9522a5dc23..847ecb82b37ee 100644
> > > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > > @@ -160,6 +160,9 @@ properties:
> > >        can be passive (no SW requirement), and requires that the MAC operate
> > >        in a different mode than the PHY in order to function.
> > >  
> > > +  phy-supply:
> > > +    description: PHY regulator
> > 
> > Is this for an serdes, sgmii, etc. type phy or ethernet phy? Either way, 
> > this property belongs in the PHY's node because it is the PHY that has 
> > supply connection. I'm guessing you put this here for the latter case 
> > because ethernet PHYs on MDIO are "discoverable" except for the small 
> > problem that powering them on is not discoverable. 
> 
> All kind of ethernet phys connected to you etherent MAC which need to be
> power controlled by software. You're right this sould belong to the PHY
> node (as Krzysztof already mentioned) but this isn't the case yet. As
> you can see there are at least 6 user of the exact same binding.
> 
> Regards,
>   Marco
> 
> 

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support

[Laurent Pinchart]

Hi Rob,

On Fri, Jul 21, 2023 at 08:24:33AM -0600, Rob Herring wrote:
> On Fri, Jul 21, 2023 at 01:03:43PM +0200, Marco Felsch wrote:
> > Document the common phy-supply property to be able to specify a phy
> > regulator.
> 
> What common property? I don't see any such property in 
> ethernet-controller.yaml.
> 
> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > ---
> > Changelog:
> > v4:
> > - no changes
> > v3:
> > - no changes
> > v2
> > - add ack-by
> > 
> >  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > index ddf9522a5dc23..847ecb82b37ee 100644
> > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > @@ -160,6 +160,9 @@ properties:
> >        can be passive (no SW requirement), and requires that the MAC operate
> >        in a different mode than the PHY in order to function.
> >  
> > +  phy-supply:
> > +    description: PHY regulator
> 
> Is this for an serdes, sgmii, etc. type phy or ethernet phy? Either way, 
> this property belongs in the PHY's node because it is the PHY that has 
> supply connection. I'm guessing you put this here for the latter case 
> because ethernet PHYs on MDIO are "discoverable" except for the small 
> problem that powering them on is not discoverable. 

Any idea on how to solve that problem generically ?

-- 
Regards,

Laurent Pinchart

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps, dwmac: add phy-supply support

[Marco Felsch]

Hi,

gentle ping on this series.

On 23-07-21, Marco Felsch wrote:
> Document the common phy-supply property to be able to specify a phy
> regulator.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> Changelog:
> v4:
> - no changes
> v3:
> - no changes
> v2
> - add ack-by
> 
>  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index ddf9522a5dc23..847ecb82b37ee 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -160,6 +160,9 @@ properties:
>        can be passive (no SW requirement), and requires that the MAC operate
>        in a different mode than the PHY in order to function.
>  
> +  phy-supply:
> +    description: PHY regulator
> +
>    snps,axi-config:
>      $ref: /schemas/types.yaml#/definitions/phandle
>      description:
> -- 
> 2.39.2
> 
> 
> 

Re: [PATCH net-next v4 1/3] dt-bindings: net: snps, dwmac: add phy-supply support

[Marco Felsch]

Hi,

On 23-08-29, Marco Felsch wrote:
> 
> Hi,
> 
> gentle ping on this series.

ping++

> On 23-07-21, Marco Felsch wrote:
> > Document the common phy-supply property to be able to specify a phy
> > regulator.
> > 
> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > ---
> > Changelog:
> > v4:
> > - no changes
> > v3:
> > - no changes
> > v2
> > - add ack-by
> > 
> >  Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > index ddf9522a5dc23..847ecb82b37ee 100644
> > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> > @@ -160,6 +160,9 @@ properties:
> >        can be passive (no SW requirement), and requires that the MAC operate
> >        in a different mode than the PHY in order to function.
> >  
> > +  phy-supply:
> > +    description: PHY regulator
> > +
> >    snps,axi-config:
> >      $ref: /schemas/types.yaml#/definitions/phandle
> >      description:
> > -- 
> > 2.39.2
> > 
> > 
> > 
> 
>