net: phy: improve pause handling
Subsystems (3)
Heiner Kallweit
maintainercover net: phy: improve pause handling
Based on a recent discussion with Andrew that's an attempt to improve several aspects of how phylib handles sym/asym pause.
Heiner Kallweit (2):
net: phy: improve pause handling
net: phy: improve phy_set_sym_pause and phy_set_asym_pause
drivers/net/phy/fixed_phy.c | 2 +- drivers/net/phy/phy-core.c | 2 +- drivers/net/phy/phy_device.c | 64 ++++++++++++++++++++++++++++-------- include/linux/phy.h | 1 + 4 files changed, 54 insertions(+), 15 deletions(-)
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH 1/2 net: phy: improve pause handling
When probing the phy device we set sym and asym pause in the "supported" bitmap (unless the PHY tells us otherwise). However we don't know yet whether the MAC supports pause. Simply copying phy->supported to phy->advertising will trigger advertising pause, and that's not what we want. Therefore add phy_advertise_supported() that copies all modes but doesn't touch the pause bits.
In phy_support_(a)sym_pause we shouldn't set any bits in the supported bitmap because we may set a bit the PHY intentionally disabled. Effective pause support should be the AND-combined PHY and MAC pause capabilities. If the MAC supports everything, then it's only relevant what the PHY supports. If MAC supports sym pause only, then we have to clear the asym bit in phydev->supported.
Copy the pause flags only and don't touch the modes, because a driver may have intentionally removed a mode from phydev->advertising.
--- drivers/net/phy/fixed_phy.c | 2 +- drivers/net/phy/phy-core.c | 2 +- drivers/net/phy/phy_device.c | 36 +++++++++++++++++++++++++++++------- include/linux/phy.h | 1 + 4 files changed, 32 insertions(+), 9 deletions(-)
drivers/net/phy/fixed_phy.c +1 -1
@@ -301,7 +301,7 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, phy->supported); } -linkmode_copy (phy->advertising, phy->supported); +phy_advertise_supported (phy); ret =phy_device_register (phy);if (ret) {
drivers/net/phy/phy-core.c +1 -1
@@ -228,7 +228,7 @@ int phy_set_max_speed(struct phy_device *phydev, u32 max_speed)if (err)return err; -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev);return 0 ; }
drivers/net/phy/phy_device.c +29 -7
@@ -1985,10 +1985,35 @@ EXPORT_SYMBOL(genphy_loopback);void phy_remove_link_mode (struct phy_device *phydev,u32 link_mode) {linkmode_clear_bit (link_mode, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev); }EXPORT_SYMBOL (phy_remove_link_mode); +static void phy_copy_pause_bits (unsigned long *dst,unsigned long *src) +{ +linkmode_mod_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, dst, +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, src)); +linkmode_mod_bit (ETHTOOL_LINK_MODE_Pause_BIT, dst, +linkmode_test_bit (ETHTOOL_LINK_MODE_Pause_BIT, src)); +} + +/** +* phy_advertise_supported - Advertise all supported modes +* @phydev: target phy_device struct +* +* Description: Called to advertise all supported modes, doesn't touch +* pause mode advertising. +*/ +void phy_advertise_supported (struct phy_device *phydev) +{ +__ETHTOOL_DECLARE_LINK_MODE_MASK (new); + +linkmode_copy (new, phydev->supported); +phy_copy_pause_bits (new, phydev->advertising); +linkmode_copy (phydev->advertising, new); +} +EXPORT_SYMBOL (phy_advertise_supported); +/** * phy_support_sym_pause - Enable support of symmetrical pause * @phydev: target phy_device struct
@@ -1999,8 +2024,7 @@ EXPORT_SYMBOL(phy_remove_link_mode);void phy_support_sym_pause (struct phy_device *phydev) {linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported); -linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_copy_pause_bits (phydev->advertising, phydev->supported); }EXPORT_SYMBOL (phy_support_sym_pause);
@@ -2012,9 +2036,7 @@ EXPORT_SYMBOL(phy_support_sym_pause);*/ void phy_support_asym_pause (struct phy_device *phydev) { -linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); -linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_copy_pause_bits (phydev->advertising, phydev->supported); }EXPORT_SYMBOL (phy_support_asym_pause);
@@ -2177,7 +2199,7 @@ static int phy_probe(struct device *dev) phydev->is_gigabit_capable =1 ;of_set_phy_supported (phydev); -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev);/* Get the EEE modes we want to prohibit. We will ask * the PHY stop advertising these mode later on
include/linux/phy.h +1 -0
@@ -1154,6 +1154,7 @@ void phy_request_interrupt(struct phy_device *phydev);void phy_print_status (struct phy_device *phydev);int phy_set_max_speed (struct phy_device *phydev,u32 max_speed);void phy_remove_link_mode (struct phy_device *phydev,u32 link_mode); +void phy_advertise_supported (struct phy_device *phydev);void phy_support_sym_pause (struct phy_device *phydev);void phy_support_asym_pause (struct phy_device *phydev); void phy_set_sym_pause(struct phy_device *phydev, bool rx, bool tx,
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH 2/2 net: phy: improve phy_set_sym_pause and phy_set_asym_pause
In reply to Heiner KallweitWe should consider what is supported, and we shouldn't mess with phydev->supported. In addition make sure that phy_set_sym_pause() clears the asym pause bit in phydev->advertising.
In phy_set_sym_pause() use the same mechanism as in phy_set_asym_pause() to restart autoneg if needed.
--- drivers/net/phy/phy_device.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/net/phy/phy_device.c +22 -6
@@ -2054,13 +2054,24 @@ EXPORT_SYMBOL(phy_support_asym_pause);void phy_set_sym_pause (struct phy_device *phydev,bool rx,bool tx,bool autoneg) { -linkmode_clear_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); +__ETHTOOL_DECLARE_LINK_MODE_MASK (oldadv); +bool sym_pause_supported; + + sym_pause_supported =linkmode_test_bit (ETHTOOL_LINK_MODE_Pause_BIT, + phydev->supported); + +linkmode_copy (oldadv, phydev->advertising); -if (rx && tx && autoneg) +linkmode_clear_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising); +linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->advertising); + +if (rx && tx && autoneg && sym_pause_supported)linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, - phydev->supported); + phydev->advertising); -linkmode_copy (phydev->advertising, phydev->supported); +if (!linkmode_equal (oldadv, phydev->advertising) && phydev->autoneg) +phy_start_aneg (phydev); }EXPORT_SYMBOL (phy_set_sym_pause);
@@ -2078,6 +2089,11 @@ EXPORT_SYMBOL(phy_set_sym_pause);void phy_set_asym_pause (struct phy_device *phydev,bool rx,bool tx) {__ETHTOOL_DECLARE_LINK_MODE_MASK (oldadv); +bool asym_pause_supported; + + asym_pause_supported = +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported);linkmode_copy (oldadv, phydev->advertising);
@@ -2086,14 +2102,14 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx)linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); -if (rx) { +if (rx && asym_pause_supported) {linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising);linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); } -if (tx) +if (tx && asym_pause_supported)linkmode_change_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising);
Signature · 1 line
2.21.0
Andrew Lunn
maintainerRe: [PATCH net-next 2/2] net: phy: improve phy_set_sym_pause and phy_set_asym_pause
Quoted 18 lines
drivers/net/phy/phy_device.c +6
-1@@ -2078,6 +2089,11 @@ EXPORT_SYMBOL(phy_set_sym_pause);void phy_set_asym_pause (struct phy_device *phydev,bool rx,bool tx) {__ETHTOOL_DECLARE_LINK_MODE_MASK (oldadv); +bool asym_pause_supported; + + asym_pause_supported = +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported);linkmode_copy (oldadv, phydev->advertising);@@ -2086,14 +2102,14 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx)linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); -if (rx) { +if (rx && asym_pause_supported) {
drivers/net/phy/phy_device.c void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) · line 2114
Quoted 10 lines
drivers/net/phy/phy_device.c +1
-1linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising);linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); } -if (tx) +if (tx && asym_pause_supported)linkmode_change_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising);
Hi Heiner
If the PHY only supports Pause, not Asym Pause, i wounder if we should fall back to Pause here?
Andrew
Heiner Kallweit
maintainerRe: [PATCH net-next 2/2] net: phy: improve phy_set_sym_pause and phy_set_asym_pause
Quoted 24 lines · Andrew Lunn
Quoted 24 lines
drivers/net/phy/phy_device.c +6
-1@@ -2078,6 +2089,11 @@ EXPORT_SYMBOL(phy_set_sym_pause);void phy_set_asym_pause (struct phy_device *phydev,bool rx,bool tx) {__ETHTOOL_DECLARE_LINK_MODE_MASK (oldadv); +bool asym_pause_supported; + + asym_pause_supported = +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported);linkmode_copy (oldadv, phydev->advertising);@@ -2086,14 +2102,14 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx)linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); -if (rx) { +if (rx && asym_pause_supported) {linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising);linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); }
Quoted 7 lines
drivers/net/phy/phy_device.c void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) · line 2114
Quoted 4 lines
drivers/net/phy/phy_device.c +1
-1-if (tx) +if (tx && asym_pause_supported)linkmode_change_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising);Hi Heiner
Hi Andrew,
Quoted 3 lines
If the PHY only supports Pause, not Asym Pause, i wounder if we should fall back to Pause here?
I wasn't sure about whether a silent fallback is the expected behavior. Also open is whether we can rely on a set_pause callback having called phy_validate_pause() before. Another option could be to change the return type to int and return an error like -EOPNOTSUPP if the requested mode isn't supported.
Quoted 2 lines
Andrew
Heiner
Heiner Kallweit
maintainerRe: [PATCH net-next 2/2] net: phy: improve phy_set_sym_pause and phy_set_asym_pause
Quoted 34 lines · Heiner Kallweit
Quoted 24 lines · Andrew Lunn
Quoted 24 lines
drivers/net/phy/phy_device.c +6
-1@@ -2078,6 +2089,11 @@ EXPORT_SYMBOL(phy_set_sym_pause);void phy_set_asym_pause (struct phy_device *phydev,bool rx,bool tx) {__ETHTOOL_DECLARE_LINK_MODE_MASK (oldadv); +bool asym_pause_supported; + + asym_pause_supported = +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported);linkmode_copy (oldadv, phydev->advertising);@@ -2086,14 +2102,14 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx)linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); -if (rx) { +if (rx && asym_pause_supported) {linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising);linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); }Quoted 7 lines
drivers/net/phy/phy_device.c void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) · line 2114
Quoted 4 lines
drivers/net/phy/phy_device.c +1
-1-if (tx) +if (tx && asym_pause_supported)linkmode_change_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising);Hi Heiner
Hi Andrew,
Quoted 9 lines
Quoted 3 lines
If the PHY only supports Pause, not Asym Pause, i wounder if we should fall back to Pause here?
I wasn't sure about whether a silent fallback is the expected behavior. Also open is whether we can rely on a
set_pausecallback having calledphy_validate_pause()before. Another option could be to change the return type to int and return an error like-EOPNOTSUPPif the requested mode isn't supported.
Most drivers call phy_validate_pause() first, this seems to be the expected pattern. Therefore I will remove patch 2. However there seems to be an error in phy_validate_pause(), the fix I will submit separately.
Quoted 4 lines
Quoted 2 lines
Andrew
Heiner
Heiner Kallweit
maintainerPATCH v2 1/1 net: phy: improve pause handling
In reply to Heiner KallweitWhen probing the phy device we set sym and asym pause in the "supported" bitmap (unless the PHY tells us otherwise). However we don't know yet whether the MAC supports pause. Simply copying phy->supported to phy->advertising will trigger advertising pause, and that's not what we want. Therefore add phy_advertise_supported() that copies all modes but doesn't touch the pause bits.
In phy_support_(a)sym_pause we shouldn't set any bits in the supported bitmap because we may set a bit the PHY intentionally disabled. Effective pause support should be the AND-combined PHY and MAC pause capabilities. If the MAC supports everything, then it's only relevant what the PHY supports. If MAC supports sym pause only, then we have to clear the asym bit in phydev->supported.
Copy the pause flags only and don't touch the modes, because a driver may have intentionally removed a mode from phydev->advertising.
---
v2:
- removed patch 2 from the series
--- drivers/net/phy/fixed_phy.c | 2 +- drivers/net/phy/phy-core.c | 2 +- drivers/net/phy/phy_device.c | 36 +++++++++++++++++++++++++++++------- include/linux/phy.h | 1 + 4 files changed, 32 insertions(+), 9 deletions(-)
drivers/net/phy/fixed_phy.c +1 -1
@@ -301,7 +301,7 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, phy->supported); } -linkmode_copy (phy->advertising, phy->supported); +phy_advertise_supported (phy); ret =phy_device_register (phy);if (ret) {
drivers/net/phy/phy-core.c +1 -1
@@ -228,7 +228,7 @@ int phy_set_max_speed(struct phy_device *phydev, u32 max_speed)if (err)return err; -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev);return 0 ; }
drivers/net/phy/phy_device.c +29 -7
@@ -1985,10 +1985,35 @@ EXPORT_SYMBOL(genphy_loopback);void phy_remove_link_mode (struct phy_device *phydev,u32 link_mode) {linkmode_clear_bit (link_mode, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev); }EXPORT_SYMBOL (phy_remove_link_mode); +static void phy_copy_pause_bits (unsigned long *dst,unsigned long *src) +{ +linkmode_mod_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, dst, +linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, src)); +linkmode_mod_bit (ETHTOOL_LINK_MODE_Pause_BIT, dst, +linkmode_test_bit (ETHTOOL_LINK_MODE_Pause_BIT, src)); +} + +/** +* phy_advertise_supported - Advertise all supported modes +* @phydev: target phy_device struct +* +* Description: Called to advertise all supported modes, doesn't touch +* pause mode advertising. +*/ +void phy_advertise_supported (struct phy_device *phydev) +{ +__ETHTOOL_DECLARE_LINK_MODE_MASK (new); + +linkmode_copy (new, phydev->supported); +phy_copy_pause_bits (new, phydev->advertising); +linkmode_copy (phydev->advertising, new); +} +EXPORT_SYMBOL (phy_advertise_supported); +/** * phy_support_sym_pause - Enable support of symmetrical pause * @phydev: target phy_device struct
@@ -1999,8 +2024,7 @@ EXPORT_SYMBOL(phy_remove_link_mode);void phy_support_sym_pause (struct phy_device *phydev) {linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported); -linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_copy_pause_bits (phydev->advertising, phydev->supported); }EXPORT_SYMBOL (phy_support_sym_pause);
@@ -2012,9 +2036,7 @@ EXPORT_SYMBOL(phy_support_sym_pause);*/ void phy_support_asym_pause (struct phy_device *phydev) { -linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); -linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported); -linkmode_copy (phydev->advertising, phydev->supported); +phy_copy_pause_bits (phydev->advertising, phydev->supported); }EXPORT_SYMBOL (phy_support_asym_pause);
@@ -2177,7 +2199,7 @@ static int phy_probe(struct device *dev) phydev->is_gigabit_capable =1 ;of_set_phy_supported (phydev); -linkmode_copy (phydev->advertising, phydev->supported); +phy_advertise_supported (phydev);/* Get the EEE modes we want to prohibit. We will ask * the PHY stop advertising these mode later on
include/linux/phy.h +1 -0
@@ -1154,6 +1154,7 @@ void phy_request_interrupt(struct phy_device *phydev);void phy_print_status (struct phy_device *phydev);int phy_set_max_speed (struct phy_device *phydev,u32 max_speed);void phy_remove_link_mode (struct phy_device *phydev,u32 link_mode); +void phy_advertise_supported (struct phy_device *phydev);void phy_support_sym_pause (struct phy_device *phydev);void phy_support_asym_pause (struct phy_device *phydev); void phy_set_sym_pause(struct phy_device *phydev, bool rx, bool tx,
Signature · 1 line
2.21.0
Quoted 16 lines · Heiner Kallweit
When probing the phy device we set sym and asym pause in the "supported" bitmap (unless the PHY tells us otherwise). However we don't know yet whether the MAC supports pause. Simply copying
phy->supportedtophy->advertisingwill trigger advertising pause, and that's not what we want. Therefore addphy_advertise_supported()that copies all modes but doesn't touch the pause bits.In phy_support_(a)sym_pause we shouldn't set any bits in the supported bitmap because we may set a bit the PHY intentionally disabled. Effective pause support should be the AND-combined PHY and MAC pause capabilities. If the MAC supports everything, then it's only relevant what the PHY supports. If MAC supports sym pause only, then we have to clear the asym bit in
phydev->supported.
Copy the pause flags only and don't touch the modes, because a driver may have intentionally removed a mode fromphydev->advertising.
Quoted 1 line
Signed-off-by Heiner Kallweit <[email protected]>
Andrew
From: Heiner Kallweit <[email protected]>
Date: Wed, 1 May 2019 21:34:43 +0200
Quoted 16 lines
When probing the phy device we set sym and asym pause in the "supported" bitmap (unless the PHY tells us otherwise). However we don't know yet whether the MAC supports pause. Simply copying
phy->supportedtophy->advertisingwill trigger advertising pause, and that's not what we want. Therefore addphy_advertise_supported()that copies all modes but doesn't touch the pause bits.In phy_support_(a)sym_pause we shouldn't set any bits in the supported bitmap because we may set a bit the PHY intentionally disabled. Effective pause support should be the AND-combined PHY and MAC pause capabilities. If the MAC supports everything, then it's only relevant what the PHY supports. If MAC supports sym pause only, then we have to clear the asym bit in
phydev->supported.
Copy the pause flags only and don't touch the modes, because a driver may have intentionally removed a mode fromphydev->advertising.
Quoted 4 lines
Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- removed patch 2 from the series
Applied.