averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-07-14 21:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: marvell: Fix 88e1510 downshift counter errata

Browse Source 
[ Upstream commit deb105f498 ]

The 88e1510 PHY has an erratum where the phy downshift counter is not
cleared after phy being suspended(BMCR_PDOWN set) and then later
resumed(BMCR_PDOWN cleared). This can cause the gigabit link to
intermittently downshift to a lower speed.

Disabling and re-enabling the downshift feature clears the counter,
allowing the PHY to retry gigabit link negotiation up to the programmed
retry count times before downshifting. This behavior has been observed
on copper links.

Signed-off-by: Rohan G Thomas <rohan.g.thomas@altera.com>
Reviewed-by: Matthew Gerlach <matthew.gerlach@altera.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250906-marvell_fix-v2-1-f6efb286937f@altera.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Rohan G Thomas
2025-12-07 06:12:22 +09:00
committed by Greg Kroah-Hartman
parent ec61fb9ccc
commit 0ed16619ce
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/phy/marvell.c
+38 -1
View File
@@ -1798,6 +1798,43 @@ error:
return err;
}
/* m88e1510_resume
*
* The 88e1510 PHY has an erratum where the phy downshift counter is not cleared
* after phy being suspended(BMCR_PDOWN set) and then later resumed(BMCR_PDOWN
* cleared). This can cause the link to intermittently downshift to a lower speed.
*
* Disabling and re-enabling the downshift feature clears the counter, allowing
* the PHY to retry gigabit link negotiation up to the programmed retry count
* before downshifting. This behavior has been observed on copper links.
*/
static int m88e1510_resume(struct phy_device *phydev)
{
int err;
u8 cnt = 0;
err = marvell_resume(phydev);
if (err < 0)
return err;
/* read downshift counter value */
err = m88e1011_get_downshift(phydev, &cnt);
if (err < 0)
return err;
if (cnt) {
/* downshift disabled */
err = m88e1011_set_downshift(phydev, 0);
if (err < 0)
return err;
/* downshift enabled, with previous counter value */
err = m88e1011_set_downshift(phydev, cnt);
}
return err;
}
static int marvell_aneg_done(struct phy_device *phydev)
{
int retval = phy_read(phydev, MII_M1011_PHY_STATUS);
@@ -3174,7 +3211,7 @@ static struct phy_driver marvell_drivers[] = {
.handle_interrupt = marvell_handle_interrupt,
.get_wol = m88e1318_get_wol,
.set_wol = m88e1318_set_wol,
.resume = marvell_resume,
.resume = m88e1510_resume,
.suspend = marvell_suspend,
.read_page = marvell_read_page,
.write_page = marvell_write_page,