Commit 68d5cd09 authored by Daniel Golle's avatar Daniel Golle Committed by Paolo Abeni
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
Link: https://patch.msgid.link/b15929a41621d215c6b2b57393368086589569ec.1728565530.git.daniel@makrotopia.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 081c9c02

drivers/net/phy/realtek.c

+15 −7
Original line number Diff line number Diff line
@@ -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;



	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);

		return 0;

	}



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

	if (lpadv < 0)

		return lpadv;



		mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising,

						  lpadv);

	}

	mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);



	return rtlgen_read_status(phydev);

	return 0;

}



static int rtl822xb_read_status(struct phy_device *phydev)