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: 49168d1980e2 ("net: phy: Add phy_support_eee() indicating MAC support EEE")
Signed-off-by: Russell King (Oracle) <[email protected]>
Reviewed-by: Heiner Kallweit <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 5695935fdce97ea6a6fa8b8798a2fbe475b7fd0d..ac987e5e82dc65ee1d9bcc1122e2b3bb5e8b23d9 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -942,7 +942,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_eee_abilities);
  */
 int genphy_c45_an_config_eee_aneg(struct phy_device *phydev)
 {
  */
 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);
                __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);
        }
 
                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);
        ret = genphy_c45_an_config_eee_aneg(phydev);
        if (ret > 0) {
                ret = phy_restart_aneg(phydev);

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 499797646580e3a07c7bdc58fd5c46264f915525..5dfa2aa53c9098fa4ebdde2b01020da27d754485 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -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.
         */
        /* 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.
         */
 
        /* 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);
 
                linkmode_and(phydev->advertising_eee, phydev->supported_eee,
                             phydev->advertising_eee);
 

diff --git a/include/linux/phy.h b/include/linux/phy.h
index a98bc91a0cde9cfce0d466708a7d18c55c7c07cb..44890cdf40a206eb0810b2db2f8bb8b98c6e87db 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -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
  * @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
  * @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);
        /* 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);
 
        /* Host supported PHY interface types. Should be ignored if empty. */
        DECLARE_PHY_INTERFACE_MASK(host_interfaces);