| Message ID | 20230331005518.2134652-5-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ethernet: Rework EEE | expand |
On 3/30/23 17:54, Andrew Lunn wrote: > Have phylib keep track of the EEE tx_lpi_enabled configuration. This > simplifies the MAC drivers, in that they don't need to store it. > > Future patches to phylib will also make use of this information to > further simplify the MAC drivers. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
On Tue, May 30, 2023 at 11:11:22AM -0700, Florian Fainelli wrote: > On 3/30/23 17:54, Andrew Lunn wrote: > > Have phylib keep track of the EEE tx_lpi_enabled configuration. This > > simplifies the MAC drivers, in that they don't need to store it. > > > > Future patches to phylib will also make use of this information to > > further simplify the MAC drivers. > > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > > Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> To Andrew: I'm not sure this is a good idea, having read 802.3 recently. EEE is supported on optical as well, which means that LPI, being a MAC thing, would need to be controlled without the PHY present. A phylink using driver would need to store the LPI config when it's used without a phylib PHY. Maybe phylink can store it on behalf of of the driver instead though.
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 6fc6a59d2f56..c7a5d0240211 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1598,7 +1598,7 @@ EXPORT_SYMBOL_GPL(phy_eee_clk_stop_enable); * @data: ethtool_eee data * * Description: it reportes the Supported/Advertisement/LP Advertisement - * capabilities. + * capabilities, etc. */ int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data) { @@ -1609,6 +1609,7 @@ int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data) mutex_lock(&phydev->lock); ret = genphy_c45_ethtool_get_eee(phydev, data); + data->tx_lpi_enabled = phydev->tx_lpi_enabled; mutex_unlock(&phydev->lock); return ret; @@ -1631,6 +1632,8 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data) mutex_lock(&phydev->lock); ret = genphy_c45_ethtool_set_eee(phydev, data); + if (!ret) + phydev->tx_lpi_enabled = data->tx_lpi_enabled; mutex_unlock(&phydev->lock); return ret; diff --git a/include/linux/phy.h b/include/linux/phy.h index dea707b3189b..4c3d80311c04 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -578,6 +578,7 @@ struct macsec_ops; * @advertising_eee: Currently advertised EEE linkmodes * @eee_enabled: Flag indicating whether the EEE feature is enabled * @eee_active: EEE is active for the current link mode + * @tx_lpi_enabled: EEE should send LPI * @lp_advertising: Current link partner advertised linkmodes * @host_interfaces: PHY interface modes supported by host * @eee_broken_modes: Energy efficient ethernet modes which should be prohibited @@ -693,6 +694,7 @@ struct phy_device { /* Energy efficient ethernet modes which should be prohibited */ u32 eee_broken_modes; bool eee_active; + bool tx_lpi_enabled; #ifdef CONFIG_LED_TRIGGER_PHY struct phy_led_trigger *phy_led_triggers;
Have phylib keep track of the EEE tx_lpi_enabled configuration. This simplifies the MAC drivers, in that they don't need to store it. Future patches to phylib will also make use of this information to further simplify the MAC drivers. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/phy/phy.c | 5 ++++- include/linux/phy.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)