Re: [PATCH net-next v12 08/18] net: phylink: Move phylink_interface_max_speed to phy_caps

[Christophe Leroy <christophe.leroy@csgroup.eu>]

Le 09/09/2025 à 17:26, Maxime Chevallier a écrit :
> The phylink_interface_max_speed() retrieves the max achievable speed
> on a MII interface. This logic needs to be re-used in other parts of the
> PHY stack, let's move it to phy_caps as it already contains most of the
> interface attribute accessors.
> 
> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
>   drivers/net/phy/phy-caps.h |  1 +
>   drivers/net/phy/phy_caps.c | 80 +++++++++++++++++++++++++++++++++++
>   drivers/net/phy/phylink.c  | 87 ++------------------------------------
>   3 files changed, 85 insertions(+), 83 deletions(-)
> 
> diff --git a/drivers/net/phy/phy-caps.h b/drivers/net/phy/phy-caps.h
> index 01df1bdc1516..ba81cd75e122 100644
> --- a/drivers/net/phy/phy-caps.h
> +++ b/drivers/net/phy/phy-caps.h
> @@ -49,6 +49,7 @@ 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);
>   unsigned long phy_caps_from_interface(phy_interface_t interface);
> +int phy_caps_interface_max_speed(phy_interface_t interface);
>   
>   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 e4efd5c477b4..b38c567ec6ef 100644
> --- a/drivers/net/phy/phy_caps.c
> +++ b/drivers/net/phy/phy_caps.c
> @@ -440,3 +440,83 @@ u32 phy_caps_mediums_from_linkmodes(unsigned long *linkmodes)
>   	return mediums;
>   }
>   EXPORT_SYMBOL_GPL(phy_caps_mediums_from_linkmodes);
> +
> +/**
> + * phy_caps_interface_max_speed() - get the maximum speed of a phy interface
> + * @interface: phy interface mode defined by &typedef phy_interface_t
> + *
> + * Determine the maximum speed of a phy interface. This is intended to help
> + * determine the correct speed to pass to the MAC when the phy is performing
> + * rate matching.
> + *
> + * Return: The maximum speed of @interface
> + */
> +int phy_caps_interface_max_speed(phy_interface_t interface)
> +{
> +	switch (interface) {
> +	case PHY_INTERFACE_MODE_100BASEX:
> +	case PHY_INTERFACE_MODE_REVRMII:
> +	case PHY_INTERFACE_MODE_RMII:
> +	case PHY_INTERFACE_MODE_SMII:
> +	case PHY_INTERFACE_MODE_REVMII:
> +	case PHY_INTERFACE_MODE_MII:
> +	case PHY_INTERFACE_MODE_MIILITE:
> +		return SPEED_100;
> +
> +	case PHY_INTERFACE_MODE_TBI:
> +	case PHY_INTERFACE_MODE_MOCA:
> +	case PHY_INTERFACE_MODE_RTBI:
> +	case PHY_INTERFACE_MODE_1000BASEX:
> +	case PHY_INTERFACE_MODE_1000BASEKX:
> +	case PHY_INTERFACE_MODE_TRGMII:
> +	case PHY_INTERFACE_MODE_RGMII_TXID:
> +	case PHY_INTERFACE_MODE_RGMII_RXID:
> +	case PHY_INTERFACE_MODE_RGMII_ID:
> +	case PHY_INTERFACE_MODE_RGMII:
> +	case PHY_INTERFACE_MODE_PSGMII:
> +	case PHY_INTERFACE_MODE_QSGMII:
> +	case PHY_INTERFACE_MODE_QUSGMII:
> +	case PHY_INTERFACE_MODE_SGMII:
> +	case PHY_INTERFACE_MODE_GMII:
> +		return SPEED_1000;
> +
> +	case PHY_INTERFACE_MODE_2500BASEX:
> +	case PHY_INTERFACE_MODE_10G_QXGMII:
> +		return SPEED_2500;
> +
> +	case PHY_INTERFACE_MODE_5GBASER:
> +		return SPEED_5000;
> +
> +	case PHY_INTERFACE_MODE_XGMII:
> +	case PHY_INTERFACE_MODE_RXAUI:
> +	case PHY_INTERFACE_MODE_XAUI:
> +	case PHY_INTERFACE_MODE_10GBASER:
> +	case PHY_INTERFACE_MODE_10GKR:
> +	case PHY_INTERFACE_MODE_USXGMII:
> +		return SPEED_10000;
> +
> +	case PHY_INTERFACE_MODE_25GBASER:
> +		return SPEED_25000;
> +
> +	case PHY_INTERFACE_MODE_XLGMII:
> +		return SPEED_40000;
> +
> +	case PHY_INTERFACE_MODE_50GBASER:
> +	case PHY_INTERFACE_MODE_LAUI:
> +		return SPEED_50000;
> +
> +	case PHY_INTERFACE_MODE_100GBASEP:
> +		return SPEED_100000;
> +
> +	case PHY_INTERFACE_MODE_INTERNAL:
> +	case PHY_INTERFACE_MODE_NA:
> +	case PHY_INTERFACE_MODE_MAX:
> +		/* No idea! Garbage in, unknown out */
> +		return SPEED_UNKNOWN;
> +	}
> +
> +	/* If we get here, someone forgot to add an interface mode above */
> +	WARN_ON_ONCE(1);
> +	return SPEED_UNKNOWN;
> +}
> +EXPORT_SYMBOL_GPL(phy_caps_interface_max_speed);
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index c7cb95aa8007..091b1ee5c49a 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -218,85 +218,6 @@ static unsigned int phylink_interface_signal_rate(phy_interface_t interface)
>   	}
>   }
>   
> -/**
> - * phylink_interface_max_speed() - get the maximum speed of a phy interface
> - * @interface: phy interface mode defined by &typedef phy_interface_t
> - *
> - * Determine the maximum speed of a phy interface. This is intended to help
> - * determine the correct speed to pass to the MAC when the phy is performing
> - * rate matching.
> - *
> - * Return: The maximum speed of @interface
> - */
> -static int phylink_interface_max_speed(phy_interface_t interface)
> -{
> -	switch (interface) {
> -	case PHY_INTERFACE_MODE_100BASEX:
> -	case PHY_INTERFACE_MODE_REVRMII:
> -	case PHY_INTERFACE_MODE_RMII:
> -	case PHY_INTERFACE_MODE_SMII:
> -	case PHY_INTERFACE_MODE_REVMII:
> -	case PHY_INTERFACE_MODE_MII:
> -	case PHY_INTERFACE_MODE_MIILITE:
> -		return SPEED_100;
> -
> -	case PHY_INTERFACE_MODE_TBI:
> -	case PHY_INTERFACE_MODE_MOCA:
> -	case PHY_INTERFACE_MODE_RTBI:
> -	case PHY_INTERFACE_MODE_1000BASEX:
> -	case PHY_INTERFACE_MODE_1000BASEKX:
> -	case PHY_INTERFACE_MODE_TRGMII:
> -	case PHY_INTERFACE_MODE_RGMII_TXID:
> -	case PHY_INTERFACE_MODE_RGMII_RXID:
> -	case PHY_INTERFACE_MODE_RGMII_ID:
> -	case PHY_INTERFACE_MODE_RGMII:
> -	case PHY_INTERFACE_MODE_PSGMII:
> -	case PHY_INTERFACE_MODE_QSGMII:
> -	case PHY_INTERFACE_MODE_QUSGMII:
> -	case PHY_INTERFACE_MODE_SGMII:
> -	case PHY_INTERFACE_MODE_GMII:
> -		return SPEED_1000;
> -
> -	case PHY_INTERFACE_MODE_2500BASEX:
> -	case PHY_INTERFACE_MODE_10G_QXGMII:
> -		return SPEED_2500;
> -
> -	case PHY_INTERFACE_MODE_5GBASER:
> -		return SPEED_5000;
> -
> -	case PHY_INTERFACE_MODE_XGMII:
> -	case PHY_INTERFACE_MODE_RXAUI:
> -	case PHY_INTERFACE_MODE_XAUI:
> -	case PHY_INTERFACE_MODE_10GBASER:
> -	case PHY_INTERFACE_MODE_10GKR:
> -	case PHY_INTERFACE_MODE_USXGMII:
> -		return SPEED_10000;
> -
> -	case PHY_INTERFACE_MODE_25GBASER:
> -		return SPEED_25000;
> -
> -	case PHY_INTERFACE_MODE_XLGMII:
> -		return SPEED_40000;
> -
> -	case PHY_INTERFACE_MODE_50GBASER:
> -	case PHY_INTERFACE_MODE_LAUI:
> -		return SPEED_50000;
> -
> -	case PHY_INTERFACE_MODE_100GBASEP:
> -		return SPEED_100000;
> -
> -	case PHY_INTERFACE_MODE_INTERNAL:
> -	case PHY_INTERFACE_MODE_NA:
> -	case PHY_INTERFACE_MODE_MAX:
> -		/* No idea! Garbage in, unknown out */
> -		return SPEED_UNKNOWN;
> -	}
> -
> -	/* If we get here, someone forgot to add an interface mode above */
> -	WARN_ON_ONCE(1);
> -	return SPEED_UNKNOWN;
> -}
> -
>   static struct {
>   	unsigned long mask;
>   	int speed;
> @@ -430,7 +351,7 @@ static unsigned long phylink_get_capabilities(phy_interface_t interface,
>   					      int rate_matching)
>   {
>   	unsigned long link_caps = phy_caps_from_interface(interface);
> -	int max_speed = phylink_interface_max_speed(interface);
> +	int max_speed = phy_caps_interface_max_speed(interface);
>   	unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
>   	unsigned long matched_caps = 0;
>   
> @@ -1529,7 +1450,7 @@ static void phylink_link_up(struct phylink *pl,
>   		 * the link_state) to the interface speed, and will send
>   		 * pause frames to the MAC to limit its transmission speed.
>   		 */
> -		speed = phylink_interface_max_speed(link_state.interface);
> +		speed = phy_caps_interface_max_speed(link_state.interface);
>   		duplex = DUPLEX_FULL;
>   		rx_pause = true;
>   		break;
> @@ -1539,7 +1460,7 @@ static void phylink_link_up(struct phylink *pl,
>   		 * the link_state) to the interface speed, and will cause
>   		 * collisions to the MAC to limit its transmission speed.
>   		 */
> -		speed = phylink_interface_max_speed(link_state.interface);
> +		speed = phy_caps_interface_max_speed(link_state.interface);
>   		duplex = DUPLEX_HALF;
>   		break;
>   	}
> @@ -2732,7 +2653,7 @@ static phy_interface_t phylink_sfp_select_interface_speed(struct phylink *pl,
>   		if (!test_bit(interface, pl->sfp_interfaces))
>   			continue;
>   
> -		max_speed = phylink_interface_max_speed(interface);
> +		max_speed = phy_caps_interface_max_speed(interface);
>   
>   		/* The logic here is: if speed == max_speed, then we've found
>   		 * the best interface. Otherwise we find the interface that