net: phylink: actually fix ksettings_set() ethtool call
Subsystems (4)
PATCH 1/1 net: phylink: actually fix ksettings_set() ethtool call
Raju Lakkaraju reported that the below commit caused a regression with Lan743x drivers and a 2.5G SFP. Sadly, this is because the commit was utterly wrong. Let's fix this properly by not moving the linkmode_and(), but instead copying the link ksettings and then modifying the advertising mask before passing the modified link ksettings to phylib.
---
Raju,
Given the number of cockups I've made with this so far, it would be a really good idea if you can explicitly test this patch and provide a tested-by. Also it would be good to have a reported-by as well.
Thanks.
drivers/net/phy/phylink.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/phy/phylink.c +10 -5
@@ -2225,11 +2225,13 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,ASSERT_RTNL (); -/* Mask out unsupported advertisements */ -linkmode_and (config.advertising, kset->link_modes.advertising, - pl->supported); -if (pl->phydev) { +struct ethtool_link_ksettings phy_kset = *kset; + +linkmode_and (phy_kset.link_modes.advertising, + phy_kset.link_modes.advertising, + pl->supported); +/* We can rely on phylib for this update; we also do not need * to update the pl->link_config settings: * - the configuration returned via ksettings_get() will come
@@ -2248,10 +2250,13 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,* the presence of a PHY, this should not be changed as that * should be determined from the media side advertisement. */ -return phy_ethtool_ksettings_set (pl->phydev, kset); +return phy_ethtool_ksettings_set (pl->phydev, &phy_kset); } config = pl->link_config; +/* Mask out unsupported advertisements */ +linkmode_and (config.advertising, kset->link_modes.advertising, + pl->supported);/* FIXME: should we reject autoneg if phy/mac does not support it? */ switch (kset->base.autoneg) {
Signature · 1 line
2.30.2
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 01 Jun 2023 10:12:06 +0100 you wrote:
Raju Lakkaraju reported that the below commit caused a regression with Lan743x drivers and a 2.5G SFP. Sadly, this is because the commit was utterly wrong. Let's fix this properly by not moving the
linkmode_and(), but instead copying the link ksettings and then modifying the advertising mask before passing the modified link ksettings to phylib.[...]
Here is the summary with links:
- [net] net: phylink: actually fix ksettings_set() ethtool call
https://git.kernel.org/netdev/net/c/03c44a21d033
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 9 lines · Russell King (Oracle)
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Raju Lakkaraju reported that the below commit caused a regression with Lan743x drivers and a 2.5G SFP. Sadly, this is because the commit was utterly wrong. Let's fix this properly by not moving the
linkmode_and(), but instead copying the link ksettings and then modifying the advertising mask before passing the modified link ksettings to phylib.
Quoted 8 lines
Fixes df0acdc59b09 ("net: phylink: fix ksettings_set() ethtool call")Signed-off-by Russell King (Oracle) <[email protected]>---
Raju,Given the number of cockups I've made with this so far, it would be a really good idea if you can explicitly test this patch and provide a tested-by. Also it would be good to have a reported-by as well.
Tested this patch with 1G Speed Cu SFP (Axcen Photonics - AXGT-R1T4-05I1) with different speeds (1G/100M/10M bps) changes.. Working as expected.
Thanks,
Raju
Quoted 46 lines
Thanks.
drivers/net/phy/phylink.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)drivers/net/phy/phylink.c +10
-6@@ -2225,11 +2225,13 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,ASSERT_RTNL (); -/* Mask out unsupported advertisements */ -linkmode_and (config.advertising, kset->link_modes.advertising, - pl->supported); -if (pl->phydev) { +struct ethtool_link_ksettings phy_kset = *kset; + +linkmode_and (phy_kset.link_modes.advertising, + phy_kset.link_modes.advertising, + pl->supported); +/* We can rely on phylib for this update; we also do not need * to update the pl->link_config settings: * - the configuration returned via ksettings_get() will come @@ -2248,10 +2250,13 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,* the presence of a PHY, this should not be changed as that * should be determined from the media side advertisement. */ -return phy_ethtool_ksettings_set (pl->phydev, kset); +return phy_ethtool_ksettings_set (pl->phydev, &phy_kset); } config = pl->link_config; +/* Mask out unsupported advertisements */ +linkmode_and (config.advertising, kset->link_modes.advertising, + pl->supported);/* FIXME: should we reject autoneg if phy/mac does not support it? */ switch (kset->base.autoneg) { --2.30.2