[PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[Wolfram Sang]

RAVB doesn't need mdiobus suspend/resume, that's why it sets
'mac_managed_pm'. However, setting it needs to be moved from init to
probe, so mdiobus PM functions will really never be called (e.g. when
the interface is not up yet during suspend/resume).

Fixes: 4924c0cdce75 ("net: ravb: Fix PHY state warning splat during system resume")
Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
---
 drivers/net/ethernet/renesas/ravb_main.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 0f54849a3823..894e2690c643 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1455,8 +1455,6 @@ static int ravb_phy_init(struct net_device *ndev)
 		phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);
 	}
 
-	/* Indicate that the MAC is responsible for managing PHY PM */
-	phydev->mac_managed_pm = true;
 	phy_attached_info(phydev);
 
 	return 0;
@@ -2379,6 +2377,8 @@ static int ravb_mdio_init(struct ravb_private *priv)
 {
 	struct platform_device *pdev = priv->pdev;
 	struct device *dev = &pdev->dev;
+	struct phy_device *phydev;
+	struct device_node *pn;
 	int error;
 
 	/* Bitbang init */
@@ -2400,6 +2400,14 @@ static int ravb_mdio_init(struct ravb_private *priv)
 	if (error)
 		goto out_free_bus;
 
+	pn = of_parse_phandle(dev->of_node, "phy-handle", 0);
+	phydev = of_phy_find_device(pn);
+	if (phydev) {
+		phydev->mac_managed_pm = true;
+		put_device(&phydev->mdio.dev);
+	}
+	of_node_put(pn);
+
 	return 0;
 
 out_free_bus:
-- 
2.30.2

Re: [PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[Sergey Shtylyov]

On 3/15/23 10:41 AM, Wolfram Sang wrote:

> RAVB doesn't need mdiobus suspend/resume, that's why it sets
> 'mac_managed_pm'. However, setting it needs to be moved from init to
> probe, so mdiobus PM functions will really never be called (e.g. when
> the interface is not up yet during suspend/resume).
> 
> Fixes: 4924c0cdce75 ("net: ravb: Fix PHY state warning splat during system resume")
> Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

[...]

Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>

MBR, Sergey

Re: [PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[Florian Fainelli]

On 3/15/23 00:41, Wolfram Sang wrote:
> RAVB doesn't need mdiobus suspend/resume, that's why it sets
> 'mac_managed_pm'. However, setting it needs to be moved from init to
> probe, so mdiobus PM functions will really never be called (e.g. when
> the interface is not up yet during suspend/resume).
> 
> Fixes: 4924c0cdce75 ("net: ravb: Fix PHY state warning splat during system resume")
> Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

This is a pattern that a lot of drivers have, for better or for worse, 
it would be neat if we couldcome up with a common helper that could work 
mostly with OF configurations, what do you think?
-- 
Florian

Re: [PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]


> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks!

> This is a pattern that a lot of drivers have, for better or for worse, it
> would be neat if we couldcome up with a common helper that could work mostly
> with OF configurations, what do you think?

I am not so experienced in this subsystem, so I only could identify 4
drivers which need this pattern, with one not using OF. So, while I
trust you with a helper being useful, I'd like to pass this task to
someone more experienced here.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH net v2 1/2] ravb: avoid PHY being resumed when interface is not up

[Florian Fainelli]

On 3/16/23 13:06, Wolfram Sang wrote:
> 
>> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
> 
> Thanks!
> 
>> This is a pattern that a lot of drivers have, for better or for worse, it
>> would be neat if we couldcome up with a common helper that could work mostly
>> with OF configurations, what do you think?
> 
> I am not so experienced in this subsystem, so I only could identify 4
> drivers which need this pattern, with one not using OF. So, while I
> trust you with a helper being useful, I'd like to pass this task to
> someone more experienced here.

That seems entirely fair, I have one such platform, so may come up with 
a helper after I debug this other issue I am looking at :)
-- 
Florian

[PATCH net v2 2/2] sh_eth: avoid PHY being resumed when interface is not up

[Wolfram Sang]

SH_ETH doesn't need mdiobus suspend/resume, that's why it sets
'mac_managed_pm'. However, setting it needs to be moved from init to
probe, so mdiobus PM functions will really never be called (e.g. when
the interface is not up yet during suspend/resume).

Fixes: 6a1dbfefdae4 ("net: sh_eth: Fix PHY state warning splat during system resume")
Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
---
 drivers/net/ethernet/renesas/sh_eth.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index ed17163d7811..d8ec729825be 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2029,8 +2029,6 @@ static int sh_eth_phy_init(struct net_device *ndev)
 	if (mdp->cd->register_type != SH_ETH_REG_GIGABIT)
 		phy_set_max_speed(phydev, SPEED_100);
 
-	/* Indicate that the MAC is responsible for managing PHY PM */
-	phydev->mac_managed_pm = true;
 	phy_attached_info(phydev);
 
 	return 0;
@@ -3097,6 +3095,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
 	struct bb_info *bitbang;
 	struct platform_device *pdev = mdp->pdev;
 	struct device *dev = &mdp->pdev->dev;
+	struct phy_device *phydev;
+	struct device_node *pn;
 
 	/* create bit control struct for PHY */
 	bitbang = devm_kzalloc(dev, sizeof(struct bb_info), GFP_KERNEL);
@@ -3133,6 +3133,14 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
 	if (ret)
 		goto out_free_bus;
 
+	pn = of_parse_phandle(dev->of_node, "phy-handle", 0);
+	phydev = of_phy_find_device(pn);
+	if (phydev) {
+		phydev->mac_managed_pm = true;
+		put_device(&phydev->mdio.dev);
+	}
+	of_node_put(pn);
+
 	return 0;
 
 out_free_bus:
-- 
2.30.2

Re: [PATCH net v2 2/2] sh_eth: avoid PHY being resumed when interface is not up

[Sergey Shtylyov]

On 3/15/23 10:41 AM, Wolfram Sang wrote:

> SH_ETH doesn't need mdiobus suspend/resume, that's why it sets
> 'mac_managed_pm'. However, setting it needs to be moved from init to
> probe, so mdiobus PM functions will really never be called (e.g. when
> the interface is not up yet during suspend/resume).
> 
> Fixes: 6a1dbfefdae4 ("net: sh_eth: Fix PHY state warning splat during system resume")
> Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>

[...]

Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>

MBR, Sergey