Commit c782c7f1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-renesas-set-mac_managed_pm-at-probe-time' 

Wolfram Sang says:

====================
net: renesas: set 'mac_managed_pm' at probe time

When suspending/resuming an interface which was not up, we saw mdiobus
related PM handling despite 'mac_managed_pm' being set for RAVB/SH_ETH.
Heiner kindly suggested the fix to set this flag at probe time, not at
init/open time. I implemented his suggestion and it works fine on these
two Renesas drivers.
====================

Link: https://lore.kernel.org/r/20230315074115.3008-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 04504793 c6be7136

drivers/net/ethernet/renesas/ravb_main.c

+10 −2
Original line number Diff line number Diff line
@@ -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:

drivers/net/ethernet/renesas/sh_eth.c

+10 −2
Original line number Diff line number Diff line
@@ -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: