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.
--- drivers/net/phy/phylink.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/phy/phylink.c +9 -4
@@ -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
@@ -2252,6 +2254,9 @@ int phylink_ethtool_ksettings_set(struct phylink *pl, } 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
Russell King (Oracle)
maintainerPlease ignore this, wrong version of the patch. :/ More coffee needed.
Quoted 49 lines · Russell King (Oracle)
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.Fixes df0acdc59b09 ("net: phylink: fix ksettings_set() ethtool call")Signed-off-by Russell King (Oracle) <[email protected]>--- drivers/net/phy/phylink.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/net/phy/phylink.c +9
-4@@ -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 @@ -2252,6 +2254,9 @@ int phylink_ethtool_ksettings_set(struct phylink *pl, } 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
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!