Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: phy: realtek: change order of calls in C22 read_status() 

Always call rtlgen_read_status() first, so genphy_read_status() which
is called by it clears bits in case auto-negotiation has not completed.
Also clear 10GBT link-partner advertisement bits in case auto-negotiation
is disabled or has not completed.

Suggested-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link: https://patch.msgid.link/b15929a41621d215c6b2b57393368086589569ec.1728565530.git.daniel@makrotopia.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Daniel Golle 2024-10-10 14:07:26 +01:00 committed by Paolo Abeni
parent 081c9c0265
commit 68d5cd09e8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/phy/realtek.c
View File

@ -949,17 +949,25 @@ static void rtl822xb_update_interface(struct phy_device *phydev)
static int rtl822x_read_status(struct phy_device *phydev)
{
if (phydev->autoneg == AUTONEG_ENABLE) {
int lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
int lpadv, ret;
if (lpadv < 0)
return lpadv;
ret = rtlgen_read_status(phydev);
if (ret < 0)
return ret;
mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising,
lpadv);
if (phydev->autoneg == AUTONEG_DISABLE ||
!phydev->autoneg_complete) {
mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
return 0;
}
return rtlgen_read_status(phydev);
lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
if (lpadv < 0)
return lpadv;
mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);
return 0;
}
static int rtl822xb_read_status(struct phy_device *phydev)