Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'net-phy-rename-eee_broken_mode'

Heiner Kallweit says:

====================
net: phy: rename eee_broken_mode

eee_broken_mode is used also if an EEE mode isn't actually broken
but e.g. not supported by MAC. So rename it.

This is split out from a bigger series that needs more rework.
====================

Link: https://patch.msgid.link/d7924d4e-49b0-4182-831f-73c558d4425e@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+12 -12
+3 -3
drivers/net/ethernet/realtek/r8169_main.c
··· 5252 5252 5253 5253 /* mimic behavior of r8125/r8126 vendor drivers */ 5254 5254 if (tp->mac_version == RTL_GIGA_MAC_VER_61) 5255 - phy_set_eee_broken(tp->phydev, 5256 - ETHTOOL_LINK_MODE_2500baseT_Full_BIT); 5257 - phy_set_eee_broken(tp->phydev, ETHTOOL_LINK_MODE_5000baseT_Full_BIT); 5255 + phy_disable_eee_mode(tp->phydev, 5256 + ETHTOOL_LINK_MODE_2500baseT_Full_BIT); 5257 + phy_disable_eee_mode(tp->phydev, ETHTOOL_LINK_MODE_5000baseT_Full_BIT); 5258 5258 5259 5259 /* PHY will be woken up in rtl_open() */ 5260 5260 phy_suspend(tp->phydev);
+1 -1
drivers/net/phy/phy-c45.c
··· 686 686 __ETHTOOL_DECLARE_LINK_MODE_MASK(tmp); 687 687 int val, changed = 0; 688 688 689 - linkmode_andnot(tmp, adv, phydev->eee_broken_modes); 689 + linkmode_andnot(tmp, adv, phydev->eee_disabled_modes); 690 690 691 691 if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) { 692 692 val = linkmode_to_mii_eee_cap1_t(tmp);
+1 -1
drivers/net/phy/phy-core.c
··· 406 406 void of_set_phy_eee_broken(struct phy_device *phydev) 407 407 { 408 408 struct device_node *node = phydev->mdio.dev.of_node; 409 - unsigned long *modes = phydev->eee_broken_modes; 409 + unsigned long *modes = phydev->eee_disabled_modes; 410 410 411 411 if (!IS_ENABLED(CONFIG_OF_MDIO) || !node) 412 412 return;
+1 -1
drivers/net/phy/phy_device.c
··· 2966 2966 phydev->eee_cfg.tx_lpi_enabled = false; 2967 2967 phydev->eee_cfg.eee_enabled = false; 2968 2968 /* don't let userspace re-enable EEE advertisement */ 2969 - linkmode_fill(phydev->eee_broken_modes); 2969 + linkmode_fill(phydev->eee_disabled_modes); 2970 2970 } 2971 2971 EXPORT_SYMBOL_GPL(phy_disable_eee); 2972 2972
+6 -6
include/linux/phy.h
··· 611 611 * @eee_cfg: User configuration of EEE 612 612 * @lp_advertising: Current link partner advertised linkmodes 613 613 * @host_interfaces: PHY interface modes supported by host 614 - * @eee_broken_modes: Energy efficient ethernet modes which should be prohibited 614 + * @eee_disabled_modes: Energy efficient ethernet modes not to be advertised 615 615 * @autoneg: Flag autoneg being used 616 616 * @rate_matching: Current rate matching mode 617 617 * @link: Current link state ··· 727 727 __ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee); 728 728 __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee); 729 729 /* Energy efficient ethernet modes which should be prohibited */ 730 - __ETHTOOL_DECLARE_LINK_MODE_MASK(eee_broken_modes); 730 + __ETHTOOL_DECLARE_LINK_MODE_MASK(eee_disabled_modes); 731 731 bool enable_tx_lpi; 732 732 bool eee_active; 733 733 struct eee_config eee_cfg; ··· 1347 1347 int phy_speed_down_core(struct phy_device *phydev); 1348 1348 1349 1349 /** 1350 - * phy_set_eee_broken - Mark an EEE mode as broken so that it isn't advertised. 1350 + * phy_disable_eee_mode - Don't advertise an EEE mode. 1351 1351 * @phydev: The phy_device struct 1352 - * @link_mode: The broken EEE mode 1352 + * @link_mode: The EEE mode to be disabled 1353 1353 */ 1354 - static inline void phy_set_eee_broken(struct phy_device *phydev, u32 link_mode) 1354 + static inline void phy_disable_eee_mode(struct phy_device *phydev, u32 link_mode) 1355 1355 { 1356 - linkmode_set_bit(link_mode, phydev->eee_broken_modes); 1356 + linkmode_set_bit(link_mode, phydev->eee_disabled_modes); 1357 1357 } 1358 1358 1359 1359 /**