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

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

net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() 



[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ]

The call to phy_stop() races with the later call to phy_disconnect(),
resulting in concurrent phy_suspend() calls being run from different
CPUs. The final call to phy_disconnect() ensures that the PHY is
stopped and suspended, too.

Fixes: c96e731c ("net: bcmgenet: connect and disconnect from the PHY state machine")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 435855b0

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

+0 −1
Original line number Diff line number Diff line
@@ -2988,7 +2988,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) 
	/* Disable MAC transmit. TX DMA disabled must be done before this */

	umac_enable_set(priv, CMD_TX_EN, false);



	phy_stop(dev->phydev);

	bcmgenet_disable_rx_napi(priv);

	bcmgenet_intr_disable(priv);