Commit 6f768905 authored by Doug Berger's avatar Doug Berger Committed by David S. Miller
Browse files

net: bcmgenet: Fix WoL with password after deep sleep 



Broadcom STB chips support a deep sleep mode where all register contents
are lost. Because we were stashing the MagicPacket password into some of
these registers a suspend into that deep sleep then a resumption would
not lead to being able to wake-up from MagicPacket with password again.

Fix this by keeping a software copy of the password and program it
during suspend.

Fixes: c51de7f3 ("net: bcmgenet: add Wake-on-LAN support code")
Suggested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72f96347

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/if_vlan.h>

#include <linux/phy.h>

#include <linux/dim.h>

#include <linux/ethtool.h>



/* total number of Buffer Descriptors, same for Rx/Tx */

#define TOTAL_DESC				256
@@ -676,6 +677,7 @@ struct bcmgenet_priv { 
	/* WOL */

	struct clk *clk_wol;

	u32 wolopts;

	u8 sopass[SOPASS_MAX];



	struct bcmgenet_mib_counters mib;

drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c

+18 −21
Original line number Diff line number Diff line
@@ -41,18 +41,13 @@ 
void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 reg;



	wol->supported = WAKE_MAGIC | WAKE_MAGICSECURE;

	wol->wolopts = priv->wolopts;

	memset(wol->sopass, 0, sizeof(wol->sopass));



	if (wol->wolopts & WAKE_MAGICSECURE) {

		reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_MS);

		put_unaligned_be16(reg, &wol->sopass[0]);

		reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_LS);

		put_unaligned_be32(reg, &wol->sopass[2]);

	}

	if (wol->wolopts & WAKE_MAGICSECURE)

		memcpy(wol->sopass, priv->sopass, sizeof(priv->sopass));

}



/* ethtool function - set WOL (Wake on LAN) settings.
@@ -62,7 +57,6 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device *kdev = &priv->pdev->dev;

	u32 reg;



	if (!device_can_wakeup(kdev))

		return -ENOTSUPP;
@@ -70,17 +64,8 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & ~(WAKE_MAGIC | WAKE_MAGICSECURE))

		return -EINVAL;



	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);

	if (wol->wolopts & WAKE_MAGICSECURE) {

		bcmgenet_umac_writel(priv, get_unaligned_be16(&wol->sopass[0]),

				     UMAC_MPD_PW_MS);

		bcmgenet_umac_writel(priv, get_unaligned_be32(&wol->sopass[2]),

				     UMAC_MPD_PW_LS);

		reg |= MPD_PW_EN;

	} else {

		reg &= ~MPD_PW_EN;

	}

	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);

	if (wol->wolopts & WAKE_MAGICSECURE)

		memcpy(priv->sopass, wol->sopass, sizeof(priv->sopass));



	/* Flag the device and relevant IRQ as wakeup capable */

	if (wol->wolopts) {
@@ -120,6 +105,14 @@ static int bcmgenet_poll_wol_status(struct bcmgenet_priv *priv) 
	return retries;

}



static void bcmgenet_set_mpd_password(struct bcmgenet_priv *priv)

{

	bcmgenet_umac_writel(priv, get_unaligned_be16(&priv->sopass[0]),

			     UMAC_MPD_PW_MS);

	bcmgenet_umac_writel(priv, get_unaligned_be32(&priv->sopass[2]),

			     UMAC_MPD_PW_LS);

}



int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv,

				enum bcmgenet_power_mode mode)

{
@@ -144,13 +137,17 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv, 


	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);

	reg |= MPD_EN;

	if (priv->wolopts & WAKE_MAGICSECURE) {

		bcmgenet_set_mpd_password(priv);

		reg |= MPD_PW_EN;

	}

	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);



	/* Do not leave UniMAC in MPD mode only */

	retries = bcmgenet_poll_wol_status(priv);

	if (retries < 0) {

		reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);

		reg &= ~MPD_EN;

		reg &= ~(MPD_EN | MPD_PW_EN);

		bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);

		return retries;

	}
@@ -189,7 +186,7 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv, 
	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);

	if (!(reg & MPD_EN))

		return;	/* already powered up so skip the rest */

	reg &= ~MPD_EN;

	reg &= ~(MPD_EN | MPD_PW_EN);

	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);



	/* Disable CRC Forward */

CRA Git | Maintained and supported by SUSTech CRA and CCSE