Commit c6be7136 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jakub Kicinski
Browse files

sh_eth: avoid PHY being resumed when interface is not up 



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: 6a1dbfef ("net: sh_eth: Fix PHY state warning splat during system resume")
Suggested-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7f5ebf5d

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: