Skip to content

Commit

Permalink
net: phy: Keep track of EEE configuration
Browse files Browse the repository at this point in the history
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: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20240302195306.3207716-4-o.rempel@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Andrew Lunn authored and Jakub Kicinski committed Mar 6, 2024
1 parent e3b6876 commit fe0d4fd
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/phy/phy.c
Original file line number Diff line number Diff line change
@@ -1640,8 +1640,8 @@ EXPORT_SYMBOL(phy_get_eee_err);
* @phydev: target phy_device struct
* @data: ethtool_keee data
*
* Description: it reportes the Supported/Advertisement/LP Advertisement
* capabilities.
* Description: reports the Supported/Advertisement/LP Advertisement
* capabilities, etc.
*/
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);
ret = genphy_c45_ethtool_get_eee(phydev, data);
eeecfg_to_eee(data, &phydev->eee_cfg);
mutex_unlock(&phydev->lock);

return ret;
@@ -1674,6 +1675,8 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_keee *data)

mutex_lock(&phydev->lock);
ret = genphy_c45_ethtool_set_eee(phydev, data);
if (!ret)
eee_to_eeecfg(&phydev->eee_cfg, data);
mutex_unlock(&phydev->lock);

return ret;
3 changes: 3 additions & 0 deletions include/linux/phy.h
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@
#include <linux/refcount.h>

#include <linux/atomic.h>
#include <net/eee.h>

#define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \
SUPPORTED_TP | \
@@ -595,6 +596,7 @@ struct macsec_ops;
* @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
* @host_interfaces: PHY interface modes supported by host
* @eee_broken_modes: Energy efficient ethernet modes which should be prohibited
@@ -715,6 +717,7 @@ struct phy_device {
/* Energy efficient ethernet modes which should be prohibited */
u32 eee_broken_modes;
bool enable_tx_lpi;
struct eee_config eee_cfg;

#ifdef CONFIG_LED_TRIGGER_PHY
struct phy_led_trigger *phy_led_triggers;

0 comments on commit fe0d4fd

Please sign in to comment.