net: phy: phy_caps: Don't skip better duplex macth on non-exact match
Subsystems (3)
PATCH v2 1/1 net: phy: phy_caps: Don't skip better duplex macth on non-exact match
When performing a non-exact phy_caps lookup, we are looking for a supported mode that matches as closely as possible the passed speed/duplex.
Blamed patch broke that logic by returning a match too early in case the caller asks for half-duplex, as a full-duplex linkmode may match first, and returned as a non-exact match without even trying to mach on half-duplex modes.
--- drivers/net/phy/phy_caps.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/phy/phy_caps.c +12 -6
@@ -188,6 +188,9 @@ phy_caps_lookup_by_linkmode_rev(const unsigned long *linkmodes, bool fdx_only)* When @exact is not set, we return either an exact match, or matching capabilities * at lower speed, or the lowest matching speed, or NULL. * +* Non-exact matches will try to return an exact speed and duplex match, but may +* return matching capabilities with same speed but a different duplex. +* * Returns: a matched link_capabilities according to the above process, NULL * otherwise. */
@@ -195,7 +198,7 @@ const struct link_capabilities * phy_caps_lookup(int speed, unsigned int duplex, const unsigned long *supported, bool exact) { - const struct link_capabilities *lcap, *last = NULL; + const struct link_capabilities *lcap, *match = NULL, *last = NULL;for_each_link_caps_desc_speed (lcap) {if (linkmode_intersects (lcap->linkmodes, supported)) {
@@ -204,16 +207,19 @@ phy_caps_lookup(int speed, unsigned int duplex, const unsigned long *supported,if (lcap->speed == speed && lcap->duplex == duplex) {return lcap; }else if (!exact) { -if (lcap->speed <= speed) -return lcap; +if (!match && lcap->speed <= speed) + match = lcap; + +if (lcap->speed < speed) +break ; } } } -if (!exact) -return last; +if (!match && !exact) + match = last; -return NULL ; +return match; }EXPORT_SYMBOL_GPL (phy_caps_lookup);
Signature · 1 line
2.49.0
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 9 lines · On Fri, 6 Jun 2025 11:43:20 +0200 you wrote:
When performing a non-exact
phy_capslookup, we are looking for a supported mode that matches as closely as possible the passed speed/duplex.Blamed patch broke that logic by returning a match too early in case the caller asks for half-duplex, as a full-duplex linkmode may match first, and returned as a non-exact match without even trying to mach on half-duplex modes.
[...]
Here is the summary with links:
- [net,v2] net: phy: phy_caps: Don't skip better duplex macth on non-exact match
https://git.kernel.org/netdev/net/c/d4e6cb324dcc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html