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

Commit d0baaadd authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: Restore phy_stop() depending upon suspend/close 



[ Upstream commit 225c657945c4a6307741cb3cc89467eadcc26e9b ]

Removing the phy_stop() from bcmgenet_netif_stop() ended up causing
warnings from the PHY library that phy_start() is called from the
RUNNING state since we are no longer stopping the PHY state machine
during bcmgenet_suspend().

Restore the call to phy_stop() but make it conditional on being called
from the close or suspend path.

Fixes: c96e731c ("net: bcmgenet: connect and disconnect from the PHY state machine")
Fixes: 93e0401e0fc0 ("net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Link: https://lore.kernel.org/r/20230515025608.2587012-1-f.fainelli@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2cca63d5

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -2973,7 +2973,7 @@ static int bcmgenet_open(struct net_device *dev) 
	return ret;

	return ret;

}

}





static void bcmgenet_netif_stop(struct net_device *dev)

static void bcmgenet_netif_stop(struct net_device *dev, bool stop_phy)

{

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct bcmgenet_priv *priv = netdev_priv(dev);
@@ -2988,6 +2988,8 @@ static void bcmgenet_netif_stop(struct net_device *dev) 
	/* Disable MAC transmit. TX DMA disabled must be done before this */

	/* Disable MAC transmit. TX DMA disabled must be done before this */

	umac_enable_set(priv, CMD_TX_EN, false);

	umac_enable_set(priv, CMD_TX_EN, false);





	if (stop_phy)

		phy_stop(dev->phydev);

	bcmgenet_disable_rx_napi(priv);

	bcmgenet_disable_rx_napi(priv);

	bcmgenet_intr_disable(priv);

	bcmgenet_intr_disable(priv);
@@ -3013,7 +3015,7 @@ static int bcmgenet_close(struct net_device *dev) 




	netif_dbg(priv, ifdown, dev, "bcmgenet_close\n");

	netif_dbg(priv, ifdown, dev, "bcmgenet_close\n");





	bcmgenet_netif_stop(dev);

	bcmgenet_netif_stop(dev, false);





	/* Really kill the PHY state machine and disconnect from it */

	/* Really kill the PHY state machine and disconnect from it */

	phy_disconnect(dev->phydev);

	phy_disconnect(dev->phydev);
@@ -3711,7 +3713,7 @@ static int bcmgenet_suspend(struct device *d) 




	netif_device_detach(dev);

	netif_device_detach(dev);





	bcmgenet_netif_stop(dev);

	bcmgenet_netif_stop(dev, true);





	if (!device_may_wakeup(d))

	if (!device_may_wakeup(d))

		phy_suspend(dev->phydev);

		phy_suspend(dev->phydev);