[PATCH net-next 07/13] net: phy: phy_caps: Move __set_linkmode_max_speed to phy_caps
From: Maxime Chevallier <maxime.chevallier@bootlin.com>
Date: 2025-02-22 14:27:42
Also in:
linux-arm-kernel, lkml
Subsystem:
ethernet phy library, networking drivers, the rest · Maintainers:
Andrew Lunn, Heiner Kallweit, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Convert the __set_linkmode_max_speed to use the link_capabilities array. This makes it easy to clamp the linkmodes to a given max speed. Introduce a new helper phy_caps_linkmode_max_speed to replace the previous one that used phy_settings. Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- drivers/net/phy/phy-caps.h | 2 ++ drivers/net/phy/phy-core.c | 19 ++++--------------- drivers/net/phy/phy_caps.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/drivers/net/phy/phy-caps.h b/drivers/net/phy/phy-caps.h
index d4cd91fd0911..55d83661fa18 100644
--- a/drivers/net/phy/phy-caps.h
+++ b/drivers/net/phy/phy-caps.h@@ -23,5 +23,7 @@ int phy_interface_max_speed(phy_interface_t interface); size_t phy_caps_speeds(unsigned int *speeds, size_t size, unsigned long *linkmodes); +void phy_caps_linkmode_max_speed(u32 max_speed, unsigned long *linkmodes); + #endif /* __PHY_CAPS_H */
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index e2850d6fe158..300d47d4fd3c 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c@@ -6,6 +6,8 @@ #include <linux/phy.h> #include <linux/of.h> +#include "phy-caps.h" + /** * phy_speed_to_str - Return a string representing the PHY link speed *
@@ -337,22 +339,9 @@ phy_lookup_setting(int speed, int duplex, const unsigned long *mask, bool exact) } EXPORT_SYMBOL_GPL(phy_lookup_setting); -static void __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, addr); - else - break; - } -} - static void __set_phy_supported(struct phy_device *phydev, u32 max_speed) { - __set_linkmode_max_speed(max_speed, phydev->supported); + phy_caps_linkmode_max_speed(max_speed, phydev->supported); } /**
@@ -556,7 +545,7 @@ int phy_speed_down_core(struct phy_device *phydev) if (min_common_speed == SPEED_UNKNOWN) return -EINVAL; - __set_linkmode_max_speed(min_common_speed, phydev->advertising); + phy_caps_linkmode_max_speed(min_common_speed, phydev->advertising); return 0; }
diff --git a/drivers/net/phy/phy_caps.c b/drivers/net/phy/phy_caps.c
index ee8aa1217a6e..cb7a5fa177b1 100644
--- a/drivers/net/phy/phy_caps.c
+++ b/drivers/net/phy/phy_caps.c@@ -129,6 +129,22 @@ size_t phy_caps_speeds(unsigned int *speeds, size_t size, return count; } +/** + * phy_caps_linkmode_max_speed() - Clamp a linkmodes set to a max speed + * @max_speed: Speed limit for the linkmode set + * @linkmodes: Linkmodes to limit + */ +void phy_caps_linkmode_max_speed(u32 max_speed, unsigned long *linkmodes) +{ + int capa; + + for (capa = __LINK_CAPA_LAST; capa >= 0; capa--) + if (link_caps[capa].speed > max_speed) + linkmode_andnot(linkmodes, linkmodes, link_caps[capa].linkmodes); + else + break; +} + /** * linkmode_from_caps() - Convert capabilities to ethtool link modes * @linkmodes: ethtool linkmode mask (must be already initialised)
--
2.48.1