net: phy: Use an internal, searchable storage for the linkmodes

The canonical definition for all the link modes is in linux/ethtool.h,
which is complemented by the link_mode_params array stored in
net/ethtool/common.h . That array contains all the metadata about each
of these modes, including the Speed and Duplex information.

Phylib and phylink needs that information as well for internal
management of the link, which was done by duplicating that information
in locally-stored arrays and lookup functions. This makes it easy for
developpers adding new modes to forget modifying phylib and phylink
accordingly.

However, the link_mode_params array in net/ethtool/common.c is fairly
inefficient to search through, as it isn't sorted in any manner. Phylib
and phylink perform a lot of lookup operations, mostly to filter modes
by speed and/or duplex.

We therefore introduce the link_caps private array in phy_caps.c, that
indexes linkmodes in a more efficient manner. Each element associated a
tuple <speed, duplex> to a bitfield of all the linkmodes runs at these
speed/duplex.

We end-up with an array that's fairly short, easily addressable and that
it optimised for the typical use-cases of phylib/phylink.

That array is initialized at the same time as phylib. As the
link_mode_params array is part of the net stack, which phylink depends
on, it should always be accessible from phylib.

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

diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 8f9ba5e8290de96deb0f0b0519b9330a31930c84..23ce205ae91d88ef28fa24ec3689bed1be16a0be 100644 (file)
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -3,7 +3,7 @@
 
 libphy-y                       := phy.o phy-c45.o phy-core.o phy_device.o \
                                   linkmode.o phy_link_topology.o \
-                                  phy_package.o
+                                  phy_package.o phy_caps.o
 mdio-bus-y                     += mdio_bus.o mdio_device.o
 
 ifdef CONFIG_MDIO_DEVICE

diff --git a/drivers/net/phy/phy-caps.h b/drivers/net/phy/phy-caps.h
new file mode 100644 (file)
index 0000000..6024f1d
--- /dev/null
+++ b/drivers/net/phy/phy-caps.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * link caps internal header, for link modes <-> capabilities <-> interfaces
+ * conversions.
+ */
+
+#ifndef __PHY_CAPS_H
+#define __PHY_CAPS_H
+
+#include <linux/ethtool.h>
+
+enum {
+       LINK_CAPA_10HD = 0,
+       LINK_CAPA_10FD,
+       LINK_CAPA_100HD,
+       LINK_CAPA_100FD,
+       LINK_CAPA_1000HD,
+       LINK_CAPA_1000FD,
+       LINK_CAPA_2500FD,
+       LINK_CAPA_5000FD,
+       LINK_CAPA_10000FD,
+       LINK_CAPA_20000FD,
+       LINK_CAPA_25000FD,
+       LINK_CAPA_40000FD,
+       LINK_CAPA_50000FD,
+       LINK_CAPA_56000FD,
+       LINK_CAPA_100000FD,
+       LINK_CAPA_200000FD,
+       LINK_CAPA_400000FD,
+       LINK_CAPA_800000FD,
+
+       __LINK_CAPA_MAX,
+};
+
+struct link_capabilities {
+       int speed;
+       unsigned int duplex;
+       __ETHTOOL_DECLARE_LINK_MODE_MASK(linkmodes);
+};
+
+int phy_caps_init(void);
+
+#endif /* __PHY_CAPS_H */

diff --git a/drivers/net/phy/phy_caps.c b/drivers/net/phy/phy_caps.c
new file mode 100644 (file)
index 0000000..6cb18e2
--- /dev/null
+++ b/drivers/net/phy/phy_caps.c
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <linux/ethtool.h>
+#include <linux/linkmode.h>
+#include <linux/phy.h>
+
+#include "phy-caps.h"
+
+static struct link_capabilities link_caps[__LINK_CAPA_MAX] __ro_after_init = {
+       { SPEED_10, DUPLEX_HALF, {0} }, /* LINK_CAPA_10HD */
+       { SPEED_10, DUPLEX_FULL, {0} }, /* LINK_CAPA_10FD */
+       { SPEED_100, DUPLEX_HALF, {0} }, /* LINK_CAPA_100HD */
+       { SPEED_100, DUPLEX_FULL, {0} }, /* LINK_CAPA_100FD */
+       { SPEED_1000, DUPLEX_HALF, {0} }, /* LINK_CAPA_1000HD */
+       { SPEED_1000, DUPLEX_FULL, {0} }, /* LINK_CAPA_1000FD */
+       { SPEED_2500, DUPLEX_FULL, {0} }, /* LINK_CAPA_2500FD */
+       { SPEED_5000, DUPLEX_FULL, {0} }, /* LINK_CAPA_5000FD */
+       { SPEED_10000, DUPLEX_FULL, {0} }, /* LINK_CAPA_10000FD */
+       { SPEED_20000, DUPLEX_FULL, {0} }, /* LINK_CAPA_20000FD */
+       { SPEED_25000, DUPLEX_FULL, {0} }, /* LINK_CAPA_25000FD */
+       { SPEED_40000, DUPLEX_FULL, {0} }, /* LINK_CAPA_40000FD */
+       { SPEED_50000, DUPLEX_FULL, {0} }, /* LINK_CAPA_50000FD */
+       { SPEED_56000, DUPLEX_FULL, {0} }, /* LINK_CAPA_56000FD */
+       { SPEED_100000, DUPLEX_FULL, {0} }, /* LINK_CAPA_100000FD */
+       { SPEED_200000, DUPLEX_FULL, {0} }, /* LINK_CAPA_200000FD */
+       { SPEED_400000, DUPLEX_FULL, {0} }, /* LINK_CAPA_400000FD */
+       { SPEED_800000, DUPLEX_FULL, {0} }, /* LINK_CAPA_800000FD */
+};
+
+static int speed_duplex_to_capa(int speed, unsigned int duplex)
+{
+       if (duplex == DUPLEX_UNKNOWN ||
+           (speed > SPEED_1000 && duplex != DUPLEX_FULL))
+               return -EINVAL;
+
+       switch (speed) {
+       case SPEED_10: return duplex == DUPLEX_FULL ?
+                             LINK_CAPA_10FD : LINK_CAPA_10HD;
+       case SPEED_100: return duplex == DUPLEX_FULL ?
+                              LINK_CAPA_100FD : LINK_CAPA_100HD;
+       case SPEED_1000: return duplex == DUPLEX_FULL ?
+                               LINK_CAPA_1000FD : LINK_CAPA_1000HD;
+       case SPEED_2500: return LINK_CAPA_2500FD;
+       case SPEED_5000: return LINK_CAPA_5000FD;
+       case SPEED_10000: return LINK_CAPA_10000FD;
+       case SPEED_20000: return LINK_CAPA_20000FD;
+       case SPEED_25000: return LINK_CAPA_25000FD;
+       case SPEED_40000: return LINK_CAPA_40000FD;
+       case SPEED_50000: return LINK_CAPA_50000FD;
+       case SPEED_56000: return LINK_CAPA_56000FD;
+       case SPEED_100000: return LINK_CAPA_100000FD;
+       case SPEED_200000: return LINK_CAPA_200000FD;
+       case SPEED_400000: return LINK_CAPA_400000FD;
+       case SPEED_800000: return LINK_CAPA_800000FD;
+       }
+
+       return -EINVAL;
+}
+
+/**
+ * phy_caps_init() - Initializes the link_caps array from the link_mode_params.
+ *
+ * Returns: 0 if phy caps init was successful, -EINVAL if we found an
+ *         unexpected linkmode setting that requires LINK_CAPS update.
+ *
+ */
+int phy_caps_init(void)
+{
+       const struct link_mode_info *linkmode;
+       int i, capa;
+
+       /* Fill the caps array from net/ethtool/common.c */
+       for (i = 0; i < __ETHTOOL_LINK_MODE_MASK_NBITS; i++) {
+               linkmode = &link_mode_params[i];
+               capa = speed_duplex_to_capa(linkmode->speed, linkmode->duplex);
+
+               if (capa < 0) {
+                       if (linkmode->speed != SPEED_UNKNOWN) {
+                               pr_err("Unknown speed %d, please update LINK_CAPS\n",
+                                      linkmode->speed);
+                               return -EINVAL;
+                       }
+                       continue;
+               }
+
+               __set_bit(i, link_caps[capa].linkmodes);
+       }
+
+       return 0;
+}

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index b2d32fbc8c8507f6280e4c3c671466f672c1cc8f..4980862398d0491b413517ef74d4db7536b803d5 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -42,6 +42,7 @@
 #include <linux/unistd.h>
 
 #include "phylib-internal.h"
+#include "phy-caps.h"
 
 MODULE_DESCRIPTION("PHY library");
 MODULE_AUTHOR("Andy Fleming");
@@ -3558,6 +3559,10 @@ static int __init phy_init(void)
        if (rc)
                goto err_ethtool_phy_ops;
 
+       rc = phy_caps_init();
+       if (rc)
+               goto err_mdio_bus;
+
        features_init();
 
        rc = phy_driver_register(&genphy_c45_driver, THIS_MODULE);