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

Commit 4e0afa88 authored by Doug Berger's avatar Doug Berger Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear 



commit 5a3c680aa2c12c90c44af383fe6882a39875ab81 upstream.

Setting the EXT_ENERGY_DET_MASK bit allows the port energy detection
logic of the internal PHY to prevent the system from sleeping. Some
internal PHYs will report that energy is detected when the network
interface is closed which can prevent the system from going to sleep
if WoL is enabled when the interface is brought down.

Since the driver does not support waking the system on this logic,
this commit clears the bit whenever the internal PHY is powered up
and the other logic for manipulating the bit is removed since it
serves no useful function.

Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a4865d1

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

+2 −14
Original line number Diff line number Diff line
@@ -1187,7 +1187,8 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, 


	switch (mode) {

	case GENET_POWER_PASSIVE:

		reg &= ~(EXT_PWR_DOWN_DLL | EXT_PWR_DOWN_BIAS);

		reg &= ~(EXT_PWR_DOWN_DLL | EXT_PWR_DOWN_BIAS |

			 EXT_ENERGY_DET_MASK);

		if (GENET_IS_V5(priv)) {

			reg &= ~(EXT_PWR_DOWN_PHY_EN |

				 EXT_PWR_DOWN_PHY_RD |
@@ -2901,12 +2902,6 @@ static int bcmgenet_open(struct net_device *dev) 


	bcmgenet_set_hw_addr(priv, dev->dev_addr);



	if (priv->internal_phy) {

		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

		reg |= EXT_ENERGY_DET_MASK;

		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

	}



	/* Disable RX/TX DMA and flush TX queues */

	dma_ctrl = bcmgenet_dma_disable(priv);
@@ -3623,7 +3618,6 @@ static int bcmgenet_resume(struct device *d) 
	struct bcmgenet_priv *priv = netdev_priv(dev);

	unsigned long dma_ctrl;

	int ret;

	u32 reg;



	if (!netif_running(dev))

		return 0;
@@ -3655,12 +3649,6 @@ static int bcmgenet_resume(struct device *d) 


	bcmgenet_set_hw_addr(priv, dev->dev_addr);



	if (priv->internal_phy) {

		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

		reg |= EXT_ENERGY_DET_MASK;

		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

	}



	if (priv->wolopts)

		bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);

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

+0 −6
Original line number Diff line number Diff line
@@ -160,12 +160,6 @@ int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv, 
	reg |= CMD_RX_EN;

	bcmgenet_umac_writel(priv, reg, UMAC_CMD);



	if (priv->hw_params->flags & GENET_HAS_EXT) {

		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

		reg &= ~EXT_ENERGY_DET_MASK;

		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

	}



	return 0;

}