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

Commit 54226116 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: systemport: Create helper to set MPD 



Create a helper function to turn on/off MPD, this will be used to avoid
duplicating code as we are going to add additional types of wake-up
types.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e85e227

drivers/net/ethernet/broadcom/bcmsysport.c

+13 −7
Original line number Diff line number Diff line
@@ -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;

	}