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

Commit 318ff60e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Resolve-races-in-phy-accessors' 



Russell King says:

====================
Resolve races in phy accessors

This series resolves races with various accesses to PHY registers.
The first five patches are necessary before we add phylink support
to mvneta, the remaining three are merely cleanups for unobserved
races, and hence are less critical.

There are two possible classes of races that can occur: where we
write to a page register that changes the meaning of a group of
other registers, and where we read-modify-write a register.

Resolve these races by performing the accesses under the mdio bus
lock, ensuring that no other user can access the bus while the
series of atomic operations are being performed.

These patches have been posted before, and have been modified
along the lines of previous feedback:

- The third patch was originally reviewed by Florian, but as I've
  added __phy_modify() to it, I've removed that attributation.
- Included generic page-based accessors as suggested last time
  around.
- Since we have the unlocked __phy_modify() in this patch series,
  it is sensible to include the changes for this to marvell.c -
  these accessors have to change anyway to avoid deadlocks on the
  mdio bus lock.

I haven't been able to test the at803x.c changes yet beyond compile
testing - although I do have systems with an ar8035 PHY.  However,
they should be straight forward to review.

This is targetted for net-next because the races have not been
found in existing drivers, but have been observed with phylink
integrated into mvneta - that's not to say that the races do not
exist today, they are just unobserved (probably through lack of
rigorous enough testing.)  The race provoking condition is detailed
in patch 5.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents be6e36d9 fea23fb5

drivers/net/phy/at803x.c

+4 −16
Original line number Diff line number Diff line
@@ -215,34 +215,22 @@ static int at803x_suspend(struct phy_device *phydev) 
	int value;

	int wol_enabled;



	mutex_lock(&phydev->lock);



	value = phy_read(phydev, AT803X_INTR_ENABLE);

	wol_enabled = value & AT803X_INTR_ENABLE_WOL;



	value = phy_read(phydev, MII_BMCR);



	if (wol_enabled)

		value |= BMCR_ISOLATE;

		value = BMCR_ISOLATE;

	else

		value |= BMCR_PDOWN;

		value = BMCR_PDOWN;



	phy_write(phydev, MII_BMCR, value);



	mutex_unlock(&phydev->lock);

	phy_modify(phydev, MII_BMCR, 0, value);



	return 0;

}



static int at803x_resume(struct phy_device *phydev)

{

	int value;



	value = phy_read(phydev, MII_BMCR);

	value &= ~(BMCR_PDOWN | BMCR_ISOLATE);

	phy_write(phydev, MII_BMCR, value);



	return 0;

	return phy_modify(phydev, MII_BMCR, ~(BMCR_PDOWN | BMCR_ISOLATE), 0);

}



static int at803x_probe(struct phy_device *phydev)

drivers/net/phy/marvell.c

+170 −272

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/phy/mdio_bus.c

+53 −12

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/phy/phy-core.c

+211 −5

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/phy/phy_device.c

+9 −41
Original line number Diff line number Diff line
@@ -1368,9 +1368,8 @@ static int genphy_config_eee_advert(struct phy_device *phydev) 
 */

int genphy_setup_forced(struct phy_device *phydev)

{

	int ctl = phy_read(phydev, MII_BMCR);

	u16 ctl = 0;



	ctl &= BMCR_LOOPBACK | BMCR_ISOLATE | BMCR_PDOWN;

	phydev->pause = 0;

	phydev->asym_pause = 0;
@@ -1382,7 +1381,8 @@ int genphy_setup_forced(struct phy_device *phydev) 
	if (DUPLEX_FULL == phydev->duplex)

		ctl |= BMCR_FULLDPLX;



	return phy_write(phydev, MII_BMCR, ctl);

	return phy_modify(phydev, MII_BMCR,

			  BMCR_LOOPBACK | BMCR_ISOLATE | BMCR_PDOWN, ctl);

}

EXPORT_SYMBOL(genphy_setup_forced);
@@ -1392,17 +1392,9 @@ EXPORT_SYMBOL(genphy_setup_forced); 
 */

int genphy_restart_aneg(struct phy_device *phydev)

{

	int ctl = phy_read(phydev, MII_BMCR);



	if (ctl < 0)

		return ctl;



	ctl |= BMCR_ANENABLE | BMCR_ANRESTART;



	/* Don't isolate the PHY if we're negotiating */

	ctl &= ~BMCR_ISOLATE;



	return phy_write(phydev, MII_BMCR, ctl);

	return phy_modify(phydev, MII_BMCR, ~BMCR_ISOLATE,

			  BMCR_ANENABLE | BMCR_ANRESTART);

}

EXPORT_SYMBOL(genphy_restart_aneg);
@@ -1668,44 +1660,20 @@ EXPORT_SYMBOL(genphy_config_init); 


int genphy_suspend(struct phy_device *phydev)

{

	int value;



	mutex_lock(&phydev->lock);



	value = phy_read(phydev, MII_BMCR);

	phy_write(phydev, MII_BMCR, value | BMCR_PDOWN);



	mutex_unlock(&phydev->lock);



	return 0;

	return phy_modify(phydev, MII_BMCR, 0, BMCR_PDOWN);

}

EXPORT_SYMBOL(genphy_suspend);



int genphy_resume(struct phy_device *phydev)

{

	int value;



	value = phy_read(phydev, MII_BMCR);

	phy_write(phydev, MII_BMCR, value & ~BMCR_PDOWN);



	return 0;

	return phy_modify(phydev, MII_BMCR, ~BMCR_PDOWN, 0);

}

EXPORT_SYMBOL(genphy_resume);



int genphy_loopback(struct phy_device *phydev, bool enable)

{

	int value;



	value = phy_read(phydev, MII_BMCR);

	if (value < 0)

		return value;



	if (enable)

		value |= BMCR_LOOPBACK;

	else

		value &= ~BMCR_LOOPBACK;



	return phy_write(phydev, MII_BMCR, value);

	return phy_modify(phydev, MII_BMCR, ~BMCR_LOOPBACK,

			  enable ? BMCR_LOOPBACK : 0);

}

EXPORT_SYMBOL(genphy_loopback);