Commit 41ffcd95 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phy: fix phylib's dual eee_enabled 



phylib has two eee_enabled members. Some parts of the code are using
phydev->eee_enabled, other parts are using phydev->eee_cfg.eee_enabled.
This leads to incorrect behaviour as their state goes out of sync.
ethtool --show-eee shows incorrect information, and --set-eee sometimes
doesn't take effect.

Fix this by only having one eee_enabled member - that in eee_cfg.

Fixes: 49168d19 ("net: phy: Add phy_support_eee() indicating MAC support EEE")
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/E1tBXAF-00341F-EQ@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0c0d0f42

drivers/net/phy/phy-c45.c

+1 −3
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_eee_abilities); 
 */

int genphy_c45_an_config_eee_aneg(struct phy_device *phydev)

{

	if (!phydev->eee_enabled) {

	if (!phydev->eee_cfg.eee_enabled) {

		__ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {};



		return genphy_c45_write_eee_adv(phydev, adv);
@@ -1575,8 +1575,6 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev, 
		linkmode_copy(phydev->advertising_eee, adv);

	}



	phydev->eee_enabled = data->eee_enabled;



	ret = genphy_c45_an_config_eee_aneg(phydev);

	if (ret > 0) {

		ret = phy_restart_aneg(phydev);

drivers/net/phy/phy_device.c

+2 −2
Original line number Diff line number Diff line
@@ -3595,12 +3595,12 @@ static int phy_probe(struct device *dev) 
	/* There is no "enabled" flag. If PHY is advertising, assume it is

	 * kind of enabled.

	 */

	phydev->eee_enabled = !linkmode_empty(phydev->advertising_eee);

	phydev->eee_cfg.eee_enabled = !linkmode_empty(phydev->advertising_eee);



	/* Some PHYs may advertise, by default, not support EEE modes. So,

	 * we need to clean them.

	 */

	if (phydev->eee_enabled)

	if (phydev->eee_cfg.eee_enabled)

		linkmode_and(phydev->advertising_eee, phydev->supported_eee,

			     phydev->advertising_eee);

include/linux/phy.h

+0 −2
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ struct macsec_ops; 
 * @adv_old: Saved advertised while power saving for WoL

 * @supported_eee: supported PHY EEE linkmodes

 * @advertising_eee: Currently advertised EEE linkmodes

 * @eee_enabled: Flag indicating whether the EEE feature is enabled

 * @enable_tx_lpi: When True, MAC should transmit LPI to PHY

 * @eee_cfg: User configuration of EEE

 * @lp_advertising: Current link partner advertised linkmodes
@@ -721,7 +720,6 @@ struct phy_device { 
	/* used for eee validation and configuration*/

	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee);

	bool eee_enabled;



	/* Host supported PHY interface types. Should be ignored if empty. */

	DECLARE_PHY_INTERFACE_MASK(host_interfaces);