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

Commit 1a864e38 authored by Andrew Lunn's avatar Andrew Lunn Committed by Greg Kroah-Hartman
Browse files

net: phy: marvell: Errata for mv88e6390 internal PHYs 



[ Upstream commit 8cbcdc1a51999ca81db2956608b917aacd28d837 ]

The VOD can be out of spec, unless some magic value is poked into an
undocumented register in an undocumented page.

Fixes: e4cf8a38 ("net: phy: Marvell: Add mv88e6390 internal PHY")
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40f2f080

drivers/net/phy/marvell.c

+34 −1
Original line number Diff line number Diff line
@@ -1063,6 +1063,39 @@ static int m88e1145_config_init(struct phy_device *phydev) 
	return 0;

}



/* The VOD can be out of specification on link up. Poke an

 * undocumented register, in an undocumented page, with a magic value

 * to fix this.

 */

static int m88e6390_errata(struct phy_device *phydev)

{

	int err;



	err = phy_write(phydev, MII_BMCR,

			BMCR_ANENABLE | BMCR_SPEED1000 | BMCR_FULLDPLX);

	if (err)

		return err;



	usleep_range(300, 400);



	err = phy_write_paged(phydev, 0xf8, 0x08, 0x36);

	if (err)

		return err;



	return genphy_soft_reset(phydev);

}



static int m88e6390_config_aneg(struct phy_device *phydev)

{

	int err;



	err = m88e6390_errata(phydev);

	if (err)

		return err;



	return m88e1510_config_aneg(phydev);

}



/**

 * fiber_lpa_to_ethtool_lpa_t

 * @lpa: value of the MII_LPA register for fiber link
@@ -2313,7 +2346,7 @@ static struct phy_driver marvell_drivers[] = { 
		.flags = PHY_HAS_INTERRUPT,

		.probe = m88e6390_probe,

		.config_init = &marvell_config_init,

		.config_aneg = &m88e1510_config_aneg,

		.config_aneg = &m88e6390_config_aneg,

		.read_status = &marvell_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,