Commit fe0d4fd9 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jakub Kicinski

net: phy: Keep track of EEE configuration

Have phylib keep track of the EEE 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.
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20240302195306.3207716-4-o.rempel@pengutronix.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e3b6876a
...@@ -1640,8 +1640,8 @@ EXPORT_SYMBOL(phy_get_eee_err); ...@@ -1640,8 +1640,8 @@ EXPORT_SYMBOL(phy_get_eee_err);
* @phydev: target phy_device struct * @phydev: target phy_device struct
* @data: ethtool_keee data * @data: ethtool_keee data
* *
* Description: it reportes the Supported/Advertisement/LP Advertisement * Description: reports the Supported/Advertisement/LP Advertisement
* capabilities. * capabilities, etc.
*/ */
int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_keee *data) int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_keee *data)
{ {
...@@ -1652,6 +1652,7 @@ int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_keee *data) ...@@ -1652,6 +1652,7 @@ int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_keee *data)
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
ret = genphy_c45_ethtool_get_eee(phydev, data); ret = genphy_c45_ethtool_get_eee(phydev, data);
eeecfg_to_eee(data, &phydev->eee_cfg);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
return ret; return ret;
...@@ -1674,6 +1675,8 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_keee *data) ...@@ -1674,6 +1675,8 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_keee *data)
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
ret = genphy_c45_ethtool_set_eee(phydev, data); ret = genphy_c45_ethtool_set_eee(phydev, data);
if (!ret)
eee_to_eeecfg(&phydev->eee_cfg, data);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
return ret; return ret;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <net/eee.h>
#define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \ #define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \
SUPPORTED_TP | \ SUPPORTED_TP | \
...@@ -595,6 +596,7 @@ struct macsec_ops; ...@@ -595,6 +596,7 @@ struct macsec_ops;
* @advertising_eee: Currently advertised EEE linkmodes * @advertising_eee: Currently advertised EEE linkmodes
* @eee_enabled: Flag indicating whether the EEE feature is enabled * @eee_enabled: Flag indicating whether the EEE feature is enabled
* @enable_tx_lpi: When True, MAC should transmit LPI to PHY * @enable_tx_lpi: When True, MAC should transmit LPI to PHY
* @eee_cfg: User configuration of EEE
* @lp_advertising: Current link partner advertised linkmodes * @lp_advertising: Current link partner advertised linkmodes
* @host_interfaces: PHY interface modes supported by host * @host_interfaces: PHY interface modes supported by host
* @eee_broken_modes: Energy efficient ethernet modes which should be prohibited * @eee_broken_modes: Energy efficient ethernet modes which should be prohibited
...@@ -715,6 +717,7 @@ struct phy_device { ...@@ -715,6 +717,7 @@ struct phy_device {
/* Energy efficient ethernet modes which should be prohibited */ /* Energy efficient ethernet modes which should be prohibited */
u32 eee_broken_modes; u32 eee_broken_modes;
bool enable_tx_lpi; bool enable_tx_lpi;
struct eee_config eee_cfg;
#ifdef CONFIG_LED_TRIGGER_PHY #ifdef CONFIG_LED_TRIGGER_PHY
struct phy_led_trigger *phy_led_triggers; struct phy_led_trigger *phy_led_triggers;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment