net: phy: let phy_speed_down/up support speeds >1Gbps
Subsystems (3)
Heiner Kallweit
maintainerv2 cover net: phy: let phy_speed_down/up support speeds >1Gbps
So far phy_speed_down/up can be used up to 1Gbps only. Remove this restriction and add needed helpers to phy-core.c
v2:
- remove unused parameter in patch 1
- rename __phy_speed_down to phy_speed_down_core in patch 2
Heiner Kallweit (3):
net: phy: add __set_linkmode_max_speed
net: phy: add phy_speed_down_core and phy_resolve_min_speed
net: phy: let phy_speed_down/up support speeds >1Gbps
drivers/net/phy/phy-core.c | 39 +++++++++++++++++++++++-- drivers/net/phy/phy.c | 60 ++++++++++---------------------------- include/linux/phy.h | 3 ++ 3 files changed, 56 insertions(+), 46 deletions(-)
Signature · 1 line
2.22.0
Heiner Kallweit
maintainerPATCH v2 1/3 net: phy: add __set_linkmode_max_speed
We will need the functionality of __set_linkmode_max_speed also for linkmode bitmaps other than phydev->supported. Therefore split it.
v2:
- remove unused parameter from __set_linkmode_max_speed
--- drivers/net/phy/phy-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/phy/phy-core.c +7 -2
@@ -207,14 +207,14 @@ size_t phy_speeds(unsigned int *speeds, size_t size,return count; } -static int __set_phy_supported (struct phy_device *phydev,u32 max_speed) +static int __set_linkmode_max_speed (u32 max_speed,unsigned long *addr) {const struct phy_setting *p;int i;for (i =0 , p = settings; i <ARRAY_SIZE (settings); i++, p++) {if (p->speed > max_speed) -linkmode_clear_bit (p->bit, phydev->supported); +linkmode_clear_bit (p->bit, addr);else break ; }
@@ -222,6 +222,11 @@ static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)return 0 ; } +static int __set_phy_supported (struct phy_device *phydev,u32 max_speed) +{ +return __set_linkmode_max_speed (max_speed, phydev->supported); +} +int phy_set_max_speed (struct phy_device *phydev,u32 max_speed) {int err;
Signature · 1 line
2.22.0
Re: [PATCH net-next v2 1/3] net: phy: add __set_linkmode_max_speed
Quoted 7 lines · Heiner Kallweit
We will need the functionality of
__set_linkmode_max_speedalso for linkmode bitmaps other thanphydev->supported. Therefore split it.v2:
- remove unused parameter from__set_linkmode_max_speedSigned-off-by Heiner Kallweit <[email protected]>
Andrew
Heiner Kallweit
maintainerPATCH v2 2/3 net: phy: add phy_speed_down_core and phy_resolve_min_speed
In reply to Heiner Kallweitphy_speed_down_core provides most of the functionality for phy_speed_down. It makes use of new helper phy_resolve_min_speed that is based on the sorting of the settings[] array. In certain cases it may be helpful to be able to exclude legacy half duplex modes, therefore prepare phy_resolve_min_speed() for it.
v2:
- rename __phy_speed_down to phy_speed_down_core
--- drivers/net/phy/phy-core.c | 28 ++++++++++++++++++++++++++++ include/linux/phy.h | 1 + 2 files changed, 29 insertions(+)
drivers/net/phy/phy-core.c +28 -0
@@ -315,6 +315,34 @@ void phy_resolve_aneg_linkmode(struct phy_device *phydev) }EXPORT_SYMBOL_GPL (phy_resolve_aneg_linkmode); +static int phy_resolve_min_speed (struct phy_device *phydev,bool fdx_only) +{ +__ETHTOOL_DECLARE_LINK_MODE_MASK (common); +int i =ARRAY_SIZE (settings); + +linkmode_and (common, phydev->lp_advertising, phydev->advertising); + +while (--i >=0 ) { +if (test_bit (settings[i].bit, common)) { +if (fdx_only && settings[i].duplex !=DUPLEX_FULL ) +continue ; +return settings[i].speed; + } + } + +return SPEED_UNKNOWN ; +} + +int phy_speed_down_core (struct phy_device *phydev) +{ +int min_common_speed =phy_resolve_min_speed (phydev, true); + +if (min_common_speed ==SPEED_UNKNOWN ) +return -EINVAL ; + +return __set_linkmode_max_speed (min_common_speed, phydev->advertising); +} +static void mmd_phy_indirect (struct mii_bus *bus,int phy_addr,int devad,u16 regnum) {
include/linux/phy.h +1 -0
@@ -665,6 +665,7 @@ size_t phy_speeds(unsigned int *speeds, size_t size, unsigned long *mask);void of_set_phy_supported (struct phy_device *phydev);void of_set_phy_eee_broken (struct phy_device *phydev); +int phy_speed_down_core (struct phy_device *phydev);/** * phy_is_started - Convenience function to check whether PHY is started
Signature · 1 line
2.22.0
Re: [PATCH net-next v2 2/3] net: phy: add phy_speed_down_core and phy_resolve_min_speed
Quoted 10 lines · Heiner Kallweit
phy_speed_down_coreprovides most of the functionality forphy_speed_down. It makes use of new helperphy_resolve_min_speedthat is based on the sorting of the settings[] array. In certain cases it may be helpful to be able to exclude legacy half duplex modes, therefore preparephy_resolve_min_speed()for it.v2:
- rename__phy_speed_downtophy_speed_down_coreSigned-off-by Heiner Kallweit <[email protected]>
Andrew
Heiner Kallweit
maintainerPATCH v2 3/3 net: phy: let phy_speed_down/up support speeds >1Gbps
In reply to Heiner KallweitSo far phy_speed_down/up can be used up to 1Gbps only. Remove this restriction by using new helper __phy_speed_down. New member adv_old in struct phy_device is used by phy_speed_up to restore the advertised modes before calling phy_speed_down. Don't simply advertise what is supported because a user may have intentionally removed modes from advertisement.
--- drivers/net/phy/phy.c | 60 ++++++++++++------------------------------- include/linux/phy.h | 2 ++ 2 files changed, 18 insertions(+), 44 deletions(-)
drivers/net/phy/phy.c +16 -44
@@ -608,38 +608,21 @@ static int phy_poll_aneg_done(struct phy_device *phydev)*/ int phy_speed_down (struct phy_device *phydev,bool sync) { -__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_old); -__ETHTOOL_DECLARE_LINK_MODE_MASK (adv); +__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_tmp);int ret;if (phydev->autoneg !=AUTONEG_ENABLE )return 0 ; -linkmode_copy (adv_old, phydev->advertising); -linkmode_copy (adv, phydev->lp_advertising); -linkmode_and (adv, adv, phydev->supported); - -if (linkmode_test_bit (ETHTOOL_LINK_MODE_10baseT_Half_BIT, adv) || -linkmode_test_bit (ETHTOOL_LINK_MODE_10baseT_Full_BIT, adv)) { -linkmode_clear_bit (ETHTOOL_LINK_MODE_100baseT_Half_BIT, - phydev->advertising); -linkmode_clear_bit (ETHTOOL_LINK_MODE_100baseT_Full_BIT, - phydev->advertising); -linkmode_clear_bit (ETHTOOL_LINK_MODE_1000baseT_Half_BIT, - phydev->advertising); -linkmode_clear_bit (ETHTOOL_LINK_MODE_1000baseT_Full_BIT, - phydev->advertising); - }else if (linkmode_test_bit (ETHTOOL_LINK_MODE_100baseT_Half_BIT, - adv) || -linkmode_test_bit (ETHTOOL_LINK_MODE_100baseT_Full_BIT, - adv)) { -linkmode_clear_bit (ETHTOOL_LINK_MODE_1000baseT_Half_BIT, - phydev->advertising); -linkmode_clear_bit (ETHTOOL_LINK_MODE_1000baseT_Full_BIT, - phydev->advertising); - } +linkmode_copy (adv_tmp, phydev->advertising); + + ret =phy_speed_down_core (phydev); +if (ret) +return ret; -if (linkmode_equal (phydev->advertising, adv_old)) +linkmode_copy (phydev->adv_old, adv_tmp); + +if (linkmode_equal (phydev->advertising, adv_tmp))return 0 ; ret =phy_config_aneg (phydev);
@@ -658,30 +641,19 @@ EXPORT_SYMBOL_GPL(phy_speed_down);*/ int phy_speed_up (struct phy_device *phydev) { -__ETHTOOL_DECLARE_LINK_MODE_MASK (all_speeds) = {0 , }; -__ETHTOOL_DECLARE_LINK_MODE_MASK (not_speeds); -__ETHTOOL_DECLARE_LINK_MODE_MASK (supported); -__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_old); -__ETHTOOL_DECLARE_LINK_MODE_MASK (speeds); - -linkmode_copy (adv_old, phydev->advertising); +__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_tmp);if (phydev->autoneg !=AUTONEG_ENABLE )return 0 ; -linkmode_set_bit (ETHTOOL_LINK_MODE_10baseT_Half_BIT, all_speeds); -linkmode_set_bit (ETHTOOL_LINK_MODE_10baseT_Full_BIT, all_speeds); -linkmode_set_bit (ETHTOOL_LINK_MODE_100baseT_Half_BIT, all_speeds); -linkmode_set_bit (ETHTOOL_LINK_MODE_100baseT_Full_BIT, all_speeds); -linkmode_set_bit (ETHTOOL_LINK_MODE_1000baseT_Half_BIT, all_speeds); -linkmode_set_bit (ETHTOOL_LINK_MODE_1000baseT_Full_BIT, all_speeds); +if (linkmode_empty (phydev->adv_old)) +return 0 ; -linkmode_andnot (not_speeds, adv_old, all_speeds); -linkmode_copy (supported, phydev->supported); -linkmode_and (speeds, supported, all_speeds); -linkmode_or (phydev->advertising, not_speeds, speeds); +linkmode_copy (adv_tmp, phydev->advertising); +linkmode_copy (phydev->advertising, phydev->adv_old); +linkmode_zero (phydev->adv_old); -if (linkmode_equal (phydev->advertising, adv_old)) +if (linkmode_equal (phydev->advertising, adv_tmp))return 0 ;return phy_config_aneg (phydev);
include/linux/phy.h +2 -0
@@ -403,6 +403,8 @@ struct phy_device {__ETHTOOL_DECLARE_LINK_MODE_MASK (supported);__ETHTOOL_DECLARE_LINK_MODE_MASK (advertising);__ETHTOOL_DECLARE_LINK_MODE_MASK (lp_advertising); +/* used with phy_speed_down */ +__ETHTOOL_DECLARE_LINK_MODE_MASK (adv_old);/* Energy efficient ethernet modes which should be prohibited */ u32 eee_broken_modes;
Signature · 1 line
2.22.0
Jakub Kicinski
AppliedQuoted 6 lines · Heiner Kallweit
So far phy_speed_down/up can be used up to 1Gbps only. Remove this restriction and add needed helpers to
phy-core.cv2:
- remove unused parameter in patch 1
- rename__phy_speed_downtophy_speed_down_corein patch 2
Applied, thanks.