net: phylink: Convert capabilities to linkmodes using phy_caps

phylink_caps_to_linkmodes() is used to derive a list of linkmodes that
can be conceivably exposed using a given set of speeds and duplex
through phylink's MAC capabilities.

This list can be derived from the link_caps array in phy_caps, provided
we convert the MAC capabilities into a LINK_CAPA bitmask first.

Introduce an internal phylink helper phylink_caps_to_link_caps() to
convert from MAC capabilities into phy_caps, then  phy_caps_linkmodes()
to do the link_caps -> linkmodes conversion.

This avoids having to update phylink for every new linkmode.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/20250307173611.129125-13-maxime.chevallier@bootlin.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/phy/phy-caps.h b/drivers/net/phy/phy-caps.h
index aef4b54a8429d24119819dc7758dcb3f1bc88bdf..7fc930876e3321d9d18cfc03547c6979df11bc2a 100644 (file)
--- a/drivers/net/phy/phy-caps.h
+++ b/drivers/net/phy/phy-caps.h
@@ -44,6 +44,7 @@ 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);
 bool phy_caps_valid(int speed, int duplex, const unsigned long *linkmodes);
+void phy_caps_linkmodes(unsigned long caps, unsigned long *linkmodes);
 
 const struct link_capabilities *
 phy_caps_lookup_by_linkmode(const unsigned long *linkmodes);

diff --git a/drivers/net/phy/phy_caps.c b/drivers/net/phy/phy_caps.c
index 0366feee2912a4307b2eb89ecefb6b027c44574b..fc1568f83c1aab681fa32670ff1c101ec85400df 100644 (file)
--- a/drivers/net/phy/phy_caps.c
+++ b/drivers/net/phy/phy_caps.c
@@ -251,3 +251,17 @@ bool phy_caps_valid(int speed, int duplex, const unsigned long *linkmodes)
 
        return linkmode_intersects(link_caps[capa].linkmodes, linkmodes);
 }
+
+/**
+ * phy_caps_linkmodes() - Convert a bitfield of capabilities into linkmodes
+ * @caps: The list of caps, each bit corresponding to a LINK_CAPA value
+ * @linkmodes: The set of linkmodes to fill. Must be previously initialized.
+ */
+void phy_caps_linkmodes(unsigned long caps, unsigned long *linkmodes)
+{
+       unsigned long capa;
+
+       for_each_set_bit(capa, &caps, __LINK_CAPA_MAX)
+               linkmode_or(linkmodes, linkmodes, link_caps[capa].linkmodes);
+}
+EXPORT_SYMBOL_GPL(phy_caps_linkmodes);

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index f9007bc14d54c7820f292b65c6087eb46f6ff913..947e6468776c0c4a04d978b3ece5f19952280103 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -317,6 +317,24 @@ static struct {
        { MAC_10HD,     SPEED_10,     DUPLEX_HALF, BIT(LINK_CAPA_10HD) },
 };
 
+/**
+ * phylink_caps_to_link_caps() - Convert a set of MAC capabilities LINK caps
+ * @caps: A set of MAC capabilities
+ *
+ * Returns: The corresponding set of LINK_CAPA as defined in phy-caps.h
+ */
+static unsigned long phylink_caps_to_link_caps(unsigned long caps)
+{
+       unsigned long link_caps = 0;
+       int i;
+
+       for (i = 0; i <  ARRAY_SIZE(phylink_caps_params); i++)
+               if (caps & phylink_caps_params[i].mask)
+                       link_caps |= phylink_caps_params[i].caps_bit;
+
+       return link_caps;
+}
+
 /**
  * phylink_caps_to_linkmodes() - Convert capabilities to ethtool link modes
  * @linkmodes: ethtool linkmode mask (must be already initialised)
@@ -328,146 +346,15 @@ static struct {
 static void phylink_caps_to_linkmodes(unsigned long *linkmodes,
                                      unsigned long caps)
 {
+       unsigned long link_caps = phylink_caps_to_link_caps(caps);
+
        if (caps & MAC_SYM_PAUSE)
                __set_bit(ETHTOOL_LINK_MODE_Pause_BIT, linkmodes);
 
        if (caps & MAC_ASYM_PAUSE)
                __set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, linkmodes);
 
-       if (caps & MAC_10HD) {
-               __set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10baseT1S_Half_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT, linkmodes);
-       }
-
-       if (caps & MAC_10FD) {
-               __set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10baseT1S_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_100HD) {
-               __set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100baseFX_Half_BIT, linkmodes);
-       }
-
-       if (caps & MAC_100FD) {
-               __set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100baseT1_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100baseFX_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_1000HD)
-               __set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, linkmodes);
-
-       if (caps & MAC_1000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_1000baseT1_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_2500FD) {
-               __set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_5000FD)
-               __set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, linkmodes);
-
-       if (caps & MAC_10000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseCR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseSR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseLR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_10000baseER_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_25000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_25000baseCR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_25000baseKR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_40000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_50000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseKR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseSR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseCR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_50000baseDR_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_56000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_100000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseKR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseSR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseCR_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_100000baseDR_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_200000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseDR2_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT, linkmodes);
-       }
-
-       if (caps & MAC_400000FD) {
-               __set_bit(ETHTOOL_LINK_MODE_400000baseKR8_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseSR8_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT,
-                         linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, linkmodes);
-               __set_bit(ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, linkmodes);
-       }
+       phy_caps_linkmodes(link_caps, linkmodes);
 }
 
 /**