net: phy: drop phy_settings and the associated lookup helpers

The phy_settings array is no longer relevant as it has now been replaced
by the link_caps array and associated phy_caps helpers.

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

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index a1caa0f313ecd27c8fcf64b6e417388eed4417cb..e177037f9110bf2233fecdd1f6091809c47c375f 100644 (file)
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -157,190 +157,6 @@ int phy_interface_num_ports(phy_interface_t interface)
 }
 EXPORT_SYMBOL_GPL(phy_interface_num_ports);
 
-/* A mapping of all SUPPORTED settings to speed/duplex.  This table
- * must be grouped by speed and sorted in descending match priority
- * - iow, descending speed.
- */
-
-#define PHY_SETTING(s, d, b) { .speed = SPEED_ ## s, .duplex = DUPLEX_ ## d, \
-                              .bit = ETHTOOL_LINK_MODE_ ## b ## _BIT}
-
-static const struct phy_setting settings[] = {
-       /* 800G */
-       PHY_SETTING( 800000, FULL, 800000baseCR8_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseKR8_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseDR8_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseDR8_2_Full         ),
-       PHY_SETTING( 800000, FULL, 800000baseSR8_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseVR8_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseCR4_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseKR4_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseDR4_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseDR4_2_Full         ),
-       PHY_SETTING( 800000, FULL, 800000baseSR4_Full           ),
-       PHY_SETTING( 800000, FULL, 800000baseVR4_Full           ),
-       /* 400G */
-       PHY_SETTING( 400000, FULL, 400000baseCR8_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseKR8_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseLR8_ER8_FR8_Full   ),
-       PHY_SETTING( 400000, FULL, 400000baseDR8_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseSR8_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseCR4_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseKR4_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseLR4_ER4_FR4_Full   ),
-       PHY_SETTING( 400000, FULL, 400000baseDR4_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseSR4_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseCR2_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseKR2_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseDR2_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseDR2_2_Full         ),
-       PHY_SETTING( 400000, FULL, 400000baseSR2_Full           ),
-       PHY_SETTING( 400000, FULL, 400000baseVR2_Full           ),
-       /* 200G */
-       PHY_SETTING( 200000, FULL, 200000baseCR4_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseKR4_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full   ),
-       PHY_SETTING( 200000, FULL, 200000baseDR4_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseSR4_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseCR2_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseKR2_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseLR2_ER2_FR2_Full   ),
-       PHY_SETTING( 200000, FULL, 200000baseDR2_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseSR2_Full           ),
-       PHY_SETTING( 200000, FULL, 200000baseCR_Full            ),
-       PHY_SETTING( 200000, FULL, 200000baseKR_Full            ),
-       PHY_SETTING( 200000, FULL, 200000baseDR_Full            ),
-       PHY_SETTING( 200000, FULL, 200000baseDR_2_Full          ),
-       PHY_SETTING( 200000, FULL, 200000baseSR_Full            ),
-       PHY_SETTING( 200000, FULL, 200000baseVR_Full            ),
-       /* 100G */
-       PHY_SETTING( 100000, FULL, 100000baseCR4_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseKR4_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full       ),
-       PHY_SETTING( 100000, FULL, 100000baseSR4_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseCR2_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseKR2_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full   ),
-       PHY_SETTING( 100000, FULL, 100000baseDR2_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseSR2_Full           ),
-       PHY_SETTING( 100000, FULL, 100000baseCR_Full            ),
-       PHY_SETTING( 100000, FULL, 100000baseKR_Full            ),
-       PHY_SETTING( 100000, FULL, 100000baseLR_ER_FR_Full      ),
-       PHY_SETTING( 100000, FULL, 100000baseDR_Full            ),
-       PHY_SETTING( 100000, FULL, 100000baseSR_Full            ),
-       /* 56G */
-       PHY_SETTING(  56000, FULL,  56000baseCR4_Full           ),
-       PHY_SETTING(  56000, FULL,  56000baseKR4_Full           ),
-       PHY_SETTING(  56000, FULL,  56000baseLR4_Full           ),
-       PHY_SETTING(  56000, FULL,  56000baseSR4_Full           ),
-       /* 50G */
-       PHY_SETTING(  50000, FULL,  50000baseCR2_Full           ),
-       PHY_SETTING(  50000, FULL,  50000baseKR2_Full           ),
-       PHY_SETTING(  50000, FULL,  50000baseSR2_Full           ),
-       PHY_SETTING(  50000, FULL,  50000baseCR_Full            ),
-       PHY_SETTING(  50000, FULL,  50000baseKR_Full            ),
-       PHY_SETTING(  50000, FULL,  50000baseLR_ER_FR_Full      ),
-       PHY_SETTING(  50000, FULL,  50000baseDR_Full            ),
-       PHY_SETTING(  50000, FULL,  50000baseSR_Full            ),
-       /* 40G */
-       PHY_SETTING(  40000, FULL,  40000baseCR4_Full           ),
-       PHY_SETTING(  40000, FULL,  40000baseKR4_Full           ),
-       PHY_SETTING(  40000, FULL,  40000baseLR4_Full           ),
-       PHY_SETTING(  40000, FULL,  40000baseSR4_Full           ),
-       /* 25G */
-       PHY_SETTING(  25000, FULL,  25000baseCR_Full            ),
-       PHY_SETTING(  25000, FULL,  25000baseKR_Full            ),
-       PHY_SETTING(  25000, FULL,  25000baseSR_Full            ),
-       /* 20G */
-       PHY_SETTING(  20000, FULL,  20000baseKR2_Full           ),
-       PHY_SETTING(  20000, FULL,  20000baseMLD2_Full          ),
-       /* 10G */
-       PHY_SETTING(  10000, FULL,  10000baseCR_Full            ),
-       PHY_SETTING(  10000, FULL,  10000baseER_Full            ),
-       PHY_SETTING(  10000, FULL,  10000baseKR_Full            ),
-       PHY_SETTING(  10000, FULL,  10000baseKX4_Full           ),
-       PHY_SETTING(  10000, FULL,  10000baseLR_Full            ),
-       PHY_SETTING(  10000, FULL,  10000baseLRM_Full           ),
-       PHY_SETTING(  10000, FULL,  10000baseR_FEC              ),
-       PHY_SETTING(  10000, FULL,  10000baseSR_Full            ),
-       PHY_SETTING(  10000, FULL,  10000baseT_Full             ),
-       /* 5G */
-       PHY_SETTING(   5000, FULL,   5000baseT_Full             ),
-       /* 2.5G */
-       PHY_SETTING(   2500, FULL,   2500baseT_Full             ),
-       PHY_SETTING(   2500, FULL,   2500baseX_Full             ),
-       /* 1G */
-       PHY_SETTING(   1000, FULL,   1000baseT_Full             ),
-       PHY_SETTING(   1000, HALF,   1000baseT_Half             ),
-       PHY_SETTING(   1000, FULL,   1000baseT1_Full            ),
-       PHY_SETTING(   1000, FULL,   1000baseX_Full             ),
-       PHY_SETTING(   1000, FULL,   1000baseKX_Full            ),
-       /* 100M */
-       PHY_SETTING(    100, FULL,    100baseT_Full             ),
-       PHY_SETTING(    100, FULL,    100baseT1_Full            ),
-       PHY_SETTING(    100, HALF,    100baseT_Half             ),
-       PHY_SETTING(    100, HALF,    100baseFX_Half            ),
-       PHY_SETTING(    100, FULL,    100baseFX_Full            ),
-       /* 10M */
-       PHY_SETTING(     10, FULL,     10baseT_Full             ),
-       PHY_SETTING(     10, HALF,     10baseT_Half             ),
-       PHY_SETTING(     10, FULL,     10baseT1L_Full           ),
-       PHY_SETTING(     10, FULL,     10baseT1S_Full           ),
-       PHY_SETTING(     10, HALF,     10baseT1S_Half           ),
-       PHY_SETTING(     10, HALF,     10baseT1S_P2MP_Half      ),
-       PHY_SETTING(     10, FULL,     10baseT1BRR_Full         ),
-};
-#undef PHY_SETTING
-
-/**
- * phy_lookup_setting - lookup a PHY setting
- * @speed: speed to match
- * @duplex: duplex to match
- * @mask: allowed link modes
- * @exact: an exact match is required
- *
- * Search the settings array for a setting that matches the speed and
- * duplex, and which is supported.
- *
- * If @exact is unset, either an exact match or %NULL for no match will
- * be returned.
- *
- * If @exact is set, an exact match, the fastest supported setting at
- * or below the specified speed, the slowest supported setting, or if
- * they all fail, %NULL will be returned.
- */
-const struct phy_setting *
-phy_lookup_setting(int speed, int duplex, const unsigned long *mask, bool exact)
-{
-       const struct phy_setting *p, *match = NULL, *last = NULL;
-       int i;
-
-       for (i = 0, p = settings; i < ARRAY_SIZE(settings); i++, p++) {
-               if (p->bit < __ETHTOOL_LINK_MODE_MASK_NBITS &&
-                   test_bit(p->bit, mask)) {
-                       last = p;
-                       if (p->speed == speed && p->duplex == duplex) {
-                               /* Exact match for speed and duplex */
-                               match = p;
-                               break;
-                       } else if (!exact) {
-                               if (!match && p->speed <= speed)
-                                       /* Candidate */
-                                       match = p;
-
-                               if (p->speed < speed)
-                                       break;
-                       }
-               }
-       }
-
-       if (!match && !exact)
-               match = last;
-
-       return match;
-}
-EXPORT_SYMBOL_GPL(phy_lookup_setting);
-
 static void __set_phy_supported(struct phy_device *phydev, u32 max_speed)
 {
        phy_caps_linkmode_max_speed(max_speed, phydev->supported);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 83c50bb21939197c7e5cd9f4dda6d49428dd9c3a..c24e1a565819629ffa70e2611fa8747debcbd8c9 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1275,19 +1275,6 @@ const char *phy_rate_matching_to_str(int rate_matching);
 
 int phy_interface_num_ports(phy_interface_t interface);
 
-/* A structure for mapping a particular speed and duplex
- * combination to a particular SUPPORTED and ADVERTISED value
- */
-struct phy_setting {
-       u32 speed;
-       u8 duplex;
-       u8 bit;
-};
-
-const struct phy_setting *
-phy_lookup_setting(int speed, int duplex, const unsigned long *mask,
-                  bool exact);
-
 /**
  * phy_is_started - Convenience function to check whether PHY is started
  * @phydev: The phy_device struct