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

Commit 40fc58f8 authored by Doug Berger's avatar Doug Berger Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access 



commit d85cf67a339685beae1d0aee27b7f61da95455be upstream.

The EXT_RGMII_OOB_CTRL register can be written from different
contexts. It is predominantly written from the adjust_link
handler which is synchronized by the phydev->lock, but can
also be written from a different context when configuring the
mii in bcmgenet_mii_config().

The chances of contention are quite low, but it is conceivable
that adjust_link could occur during resume when WoL is enabled
so use the phydev->lock synchronizer in bcmgenet_mii_config()
to be sure.

Fixes: afe3f907 ("net: bcmgenet: power on MII block for all MII modes")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Acked-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f470a80

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

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) 
	 * block for the interface to work

	 */

	if (priv->ext_phy) {

		mutex_lock(&phydev->lock);

		reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);

		reg |= id_mode_dis;

		if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv))
@@ -276,6 +277,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) 
		else

			reg |= RGMII_MODE_EN;

		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);

		mutex_unlock(&phydev->lock);

	}



	if (init)