Commit 98bb7399 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: bcmgenet: correctly resume adapter from Wake-on-LAN

In case we configured the adapter to be a wake up source from
Wake-on-LAN, but we never actually woke up using Wake-on-LAN, we will
leave the adapter in MagicPacket matching mode, which prevents any other
type of packets from reaching the RX engine. Fix this by calling
bcmgenet_power_up() with GENET_POWER_WOL_MAGIC to restore the adapter
configuration in bcmgenet_resume().

The second problem we had was an imbalanced clock disabling in
bcmgenet_wol_resume(), the Wake-on-LAN slow clock is only enabled in
bcmgenet_suspend() if we configured Wake-on-LAN, yet we unconditionally
disabled the clock in bcmgenet_wol_resume().

Fixes: 8c90db72 ("net: bcmgenet: suspend and resume from Wake-on-LAN")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c677ba8b
...@@ -1962,7 +1962,8 @@ static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv, ...@@ -1962,7 +1962,8 @@ static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv,
static int bcmgenet_wol_resume(struct bcmgenet_priv *priv) static int bcmgenet_wol_resume(struct bcmgenet_priv *priv)
{ {
/* From WOL-enabled suspend, switch to regular clock */ /* From WOL-enabled suspend, switch to regular clock */
clk_disable_unprepare(priv->clk_wol); if (priv->wolopts)
clk_disable_unprepare(priv->clk_wol);
phy_init_hw(priv->phydev); phy_init_hw(priv->phydev);
/* Speed settings must be restored */ /* Speed settings must be restored */
...@@ -2668,9 +2669,7 @@ static int bcmgenet_resume(struct device *d) ...@@ -2668,9 +2669,7 @@ static int bcmgenet_resume(struct device *d)
if (ret) if (ret)
goto out_clk_disable; goto out_clk_disable;
if (priv->wolopts) ret = bcmgenet_wol_resume(priv);
ret = bcmgenet_wol_resume(priv);
if (ret) if (ret)
goto out_clk_disable; goto out_clk_disable;
...@@ -2685,6 +2684,9 @@ static int bcmgenet_resume(struct device *d) ...@@ -2685,6 +2684,9 @@ static int bcmgenet_resume(struct device *d)
bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
} }
if (priv->wolopts)
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */ /* Disable RX/TX DMA and flush TX queues */
dma_ctrl = bcmgenet_dma_disable(priv); dma_ctrl = bcmgenet_dma_disable(priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment