Commit d3eb5854 authored by Daniel Golle's avatar Daniel Golle Committed by David S. Miller
Browse files

net: phy: realtek: always clear NBase-T lpa 



Clear NBase-T link partner advertisement before calling
rtlgen_read_status() to avoid phy_resolve_aneg_linkmode() wrongly
setting speed and duplex.

This fixes bogus 2.5G/5G/10G link partner advertisement and thus
speed and duplex being set by phy_resolve_aneg_linkmode() due to stale
NBase-T lpa.

Fixes: 68d5cd09 ("net: phy: realtek: change order of calls in C22 read_status()")
Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea8318cb

drivers/net/phy/realtek.c

+3 −3
Original line number Diff line number Diff line
@@ -952,15 +952,15 @@ static int rtl822x_read_status(struct phy_device *phydev) 
{

	int lpadv, ret;



	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);



	ret = rtlgen_read_status(phydev);

	if (ret < 0)

		return ret;



	if (phydev->autoneg == AUTONEG_DISABLE ||

	    !phydev->autoneg_complete) {

		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);

	    !phydev->autoneg_complete)

		return 0;

	}



	lpadv = phy_read_paged(phydev, 0xa5d, 0x13);

	if (lpadv < 0)