iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ethernet: ave: Preserve wol state in suspend/resume sequence

Browse Source 
Since the wol state forces to be initialized after reset, the state should
be preserved in suspend/resume sequence.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kunihiko Hayashi 2018-11-29 17:06:33 +09:00 committed by David S. Miller
parent 7200f2e3c9
commit 8d1283b1d6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/socionext/sni_ave.c
View File

@ -261,6 +261,7 @@ struct ave_private {
struct regmap *regmap; struct regmap *regmap;
unsigned int pinmode_mask; unsigned int pinmode_mask;
unsigned int pinmode_val; unsigned int pinmode_val;
u32 wolopts;
/* stats */ /* stats */
struct ave_stats stats_rx; struct ave_stats stats_rx;
@ -1741,6 +1742,7 @@ static int ave_remove(struct platform_device *pdev)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int ave_suspend(struct device *dev) static int ave_suspend(struct device *dev)
{ {
struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct ave_private *priv = netdev_priv(ndev); struct ave_private *priv = netdev_priv(ndev);
int ret = 0; int ret = 0;
@ -1750,17 +1752,25 @@ static int ave_suspend(struct device *dev)
netif_device_detach(ndev); netif_device_detach(ndev);
} }
ave_ethtool_get_wol(ndev, &wol);
priv->wolopts = wol.wolopts;
return ret; return ret;
} }
static int ave_resume(struct device *dev) static int ave_resume(struct device *dev)
{ {
struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct ave_private *priv = netdev_priv(ndev); struct ave_private *priv = netdev_priv(ndev);
int ret = 0; int ret = 0;
ave_global_reset(ndev); ave_global_reset(ndev);
ave_ethtool_get_wol(ndev, &wol);
wol.wolopts = priv->wolopts;
ave_ethtool_set_wol(ndev, &wol);
if (ndev->phydev) { if (ndev->phydev) {
ret = phy_resume(ndev->phydev); ret = phy_resume(ndev->phydev);
if (ret) if (ret)