Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82960fff authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller
Browse files

net: mvneta: fix failed to suspend if WOL is enabled 



Recently, suspend/resume and WOL support are added into mvneta driver.
If we enable WOL, then we get some error as below on Marvell BG4CT
platforms during suspend:

[  184.149723] dpm_run_callback(): mdio_bus_suspend+0x0/0x50 returns -16
[  184.149727] PM: Device f7b62004.mdio-mi:00 failed to suspend: error -16

-16 means -EBUSY, phy_suspend() will return -EBUSY if it finds the
device has WOL enabled.

We fix this issue by properly setting the netdev's power.can_wakeup
and power.wakeup, i.e

1. in mvneta_mdio_probe(), call device_set_wakeup_capable() to set
power.can_wakeup if the phy support WOL.

2. in mvneta_ethtool_set_wol(), call device_set_wakeup_enable() to
set power.wakeup if WOL has been successfully enabled in phy.

Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cab93af0

drivers/net/ethernet/marvell/mvneta.c

+11 −1
Original line number Diff line number Diff line
@@ -3318,6 +3318,7 @@ static void mvneta_adjust_link(struct net_device *ndev) 
static int mvneta_mdio_probe(struct mvneta_port *pp)

{

	struct phy_device *phy_dev;

	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };



	phy_dev = of_phy_connect(pp->dev, pp->phy_node, mvneta_adjust_link, 0,

				 pp->phy_interface);
@@ -3326,6 +3327,9 @@ static int mvneta_mdio_probe(struct mvneta_port *pp) 
		return -ENODEV;

	}



	phy_ethtool_get_wol(phy_dev, &wol);

	device_set_wakeup_capable(&pp->dev->dev, !!wol.supported);



	phy_dev->supported &= PHY_GBIT_FEATURES;

	phy_dev->advertising = phy_dev->supported;
@@ -3942,10 +3946,16 @@ static void mvneta_ethtool_get_wol(struct net_device *dev, 
static int mvneta_ethtool_set_wol(struct net_device *dev,

				  struct ethtool_wolinfo *wol)

{

	int ret;



	if (!dev->phydev)

		return -EOPNOTSUPP;



	return phy_ethtool_set_wol(dev->phydev, wol);

	ret = phy_ethtool_set_wol(dev->phydev, wol);

	if (!ret)

		device_set_wakeup_enable(&dev->dev, !!wol->wolopts);



	return ret;

}



static const struct net_device_ops mvneta_netdev_ops = {