Skip to content

Commit

Permalink
net: ethernet: ave: Set initial wol state to disabled
Browse files Browse the repository at this point in the history
If wol state of phy hardware is enabled after reset, phy_ethtool_get_wol()
returns that wol.wolopts is true.

However, since net_device.wol_enabled is zero and this doesn't apply wol
state until calling ethtool_set_wol(), so mdio_bus_phy_may_suspend()
returns true, that is, it's in a state where phy can suspend even though
wol state is enabled.

In this inconsistency, phy_suspend() returns -EBUSY, and at last,
suspend sequence fails with the following message:

    dpm_run_callback(): mdio_bus_phy_suspend+0x0/0x58 returns -16
    PM: Device 65000000.ethernet-ffffffff:01 failed to suspend: error -16
    PM: Some devices failed to suspend, or early wake event detected

In order to fix the above issue, this patch forces to set initial wol state
to disabled as default.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kunihiko Hayashi authored and David S. Miller committed Nov 29, 2018
1 parent 0ba78b4 commit 7200f2e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/net/ethernet/socionext/sni_ave.c
Original file line number Diff line number Diff line change
Expand Up @@ -1208,9 +1208,13 @@ static int ave_init(struct net_device *ndev)

priv->phydev = phydev;

phy_ethtool_get_wol(phydev, &wol);
ave_ethtool_get_wol(ndev, &wol);
device_set_wakeup_capable(&ndev->dev, !!wol.supported);

/* set wol initial state disabled */
wol.wolopts = 0;
ave_ethtool_set_wol(ndev, &wol);

if (!phy_interface_is_rgmii(phydev))
phy_set_max_speed(phydev, SPEED_100);

Expand Down

0 comments on commit 7200f2e

Please sign in to comment.