|
|
@@ -1041,17 +1041,25 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget)
|
|
|
return work_done;
|
|
|
}
|
|
|
|
|
|
-static void bcm_sysport_resume_from_wol(struct bcm_sysport_priv *priv)
|
|
|
+static void mpd_enable_set(struct bcm_sysport_priv *priv, bool enable)
|
|
|
{
|
|
|
u32 reg;
|
|
|
|
|
|
+ reg = umac_readl(priv, UMAC_MPD_CTRL);
|
|
|
+ if (enable)
|
|
|
+ reg |= MPD_EN;
|
|
|
+ else
|
|
|
+ reg &= ~MPD_EN;
|
|
|
+ umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
+}
|
|
|
+
|
|
|
+static void bcm_sysport_resume_from_wol(struct bcm_sysport_priv *priv)
|
|
|
+{
|
|
|
/* Stop monitoring MPD interrupt */
|
|
|
intrl2_0_mask_set(priv, INTRL2_0_MPD);
|
|
|
|
|
|
/* Clear the MagicPacket detection logic */
|
|
|
- reg = umac_readl(priv, UMAC_MPD_CTRL);
|
|
|
- reg &= ~MPD_EN;
|
|
|
- umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
+ mpd_enable_set(priv, false);
|
|
|
|
|
|
netif_dbg(priv, wol, priv->netdev, "resumed from WOL\n");
|
|
|
}
|
|
|
@@ -2447,9 +2455,7 @@ static int bcm_sysport_suspend_to_wol(struct bcm_sysport_priv *priv)
|
|
|
|
|
|
/* Do not leave the UniMAC RBUF matching only MPD packets */
|
|
|
if (!timeout) {
|
|
|
- reg = umac_readl(priv, UMAC_MPD_CTRL);
|
|
|
- reg &= ~MPD_EN;
|
|
|
- umac_writel(priv, reg, UMAC_MPD_CTRL);
|
|
|
+ mpd_enable_set(priv, false);
|
|
|
netif_err(priv, wol, ndev, "failed to enter WOL mode\n");
|
|
|
return -ETIMEDOUT;
|
|
|
}
|