github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: phy: rename eee_broken_modes to eee_disabled_modes

Browse Source 
This bitmap is used also if the MAC doesn't support an EEE mode.
So the mode isn't necessarily broken in the PHY. Therefore rename
the bitmap.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/6cd11422-dd67-4c87-a642-308de694af92@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Heiner Kallweit 2025-02-10 21:49:22 +01:00 committed by Jakub Kicinski
parent ae9b3c0e79
commit 8eb0d381be
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/phy/phy-c45.c
View File

@ -686,7 +686,7 @@ static int genphy_c45_write_eee_adv(struct phy_device *phydev,
__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);
int val, changed = 0;
linkmode_andnot(tmp, adv, phydev->eee_broken_modes);
linkmode_andnot(tmp, adv, phydev->eee_disabled_modes);
if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) {
val = linkmode_to_mii_eee_cap1_t(tmp);

2
drivers/net/phy/phy-core.c
View File

@ -406,7 +406,7 @@ void of_set_phy_supported(struct phy_device *phydev)
void of_set_phy_eee_broken(struct phy_device *phydev)
{
struct device_node *node = phydev->mdio.dev.of_node;
unsigned long *modes = phydev->eee_broken_modes;
unsigned long *modes = phydev->eee_disabled_modes;
if (!IS_ENABLED(CONFIG_OF_MDIO) || !node)
return;

2
drivers/net/phy/phy_device.c
View File

@ -2966,7 +2966,7 @@ void phy_disable_eee(struct phy_device *phydev)
phydev->eee_cfg.tx_lpi_enabled = false;
phydev->eee_cfg.eee_enabled = false;
/* don't let userspace re-enable EEE advertisement */
linkmode_fill(phydev->eee_broken_modes);
linkmode_fill(phydev->eee_disabled_modes);
}
EXPORT_SYMBOL_GPL(phy_disable_eee);

6
include/linux/phy.h
View File

@ -611,7 +611,7 @@ struct macsec_ops;
* @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
* @eee_disabled_modes: Energy efficient ethernet modes not to be advertised
* @autoneg: Flag autoneg being used
* @rate_matching: Current rate matching mode
* @link: Current link state
@ -727,7 +727,7 @@ struct phy_device {
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee);
__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee);
/* Energy efficient ethernet modes which should be prohibited */
__ETHTOOL_DECLARE_LINK_MODE_MASK(eee_broken_modes);
__ETHTOOL_DECLARE_LINK_MODE_MASK(eee_disabled_modes);
bool enable_tx_lpi;
bool eee_active;
struct eee_config eee_cfg;
@ -1353,7 +1353,7 @@ int phy_speed_down_core(struct phy_device *phydev);
*/
static inline void phy_set_eee_broken(struct phy_device *phydev, u32 link_mode)
{
linkmode_set_bit(link_mode, phydev->eee_broken_modes);
linkmode_set_bit(link_mode, phydev->eee_disabled_modes);
}
/**