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

Commit 8ff44985 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller
Browse files

phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs 



According to specs, when auto-negotiation is disabled, Marvell PHYs need
a software reset after changing speed/duplex forcing bits. Otherwise,
the modified bits have no effect.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4b11649

drivers/net/phy/marvell.c

+20 −1
Original line number Diff line number Diff line
@@ -155,10 +155,29 @@ static int marvell_config_aneg(struct phy_device *phydev) 
		return err;



	err = genphy_config_aneg(phydev);

	if (err < 0)

		return err;



	if (phydev->autoneg != AUTONEG_ENABLE) {

		int bmcr;



		/*

		 * A write to speed/duplex bits (that is performed by

		 * genphy_config_aneg() call above) must be followed by

		 * a software reset. Otherwise, the write has no effect.

		 */

		bmcr = phy_read(phydev, MII_BMCR);

		if (bmcr < 0)

			return bmcr;



		err = phy_write(phydev, MII_BMCR, bmcr | BMCR_RESET);

		if (err < 0)

			return err;

	}



	return 0;

}



static int m88e1121_config_aneg(struct phy_device *phydev)

{

	int err, temp;