Commit 3bd87f3b authored by Maxime Chevallier's avatar Maxime Chevallier Committed by Paolo Abeni
Browse files

net: phylink: Use phy_caps to get an interface's capabilities and modes 



Phylink has internal code to get the MAC capabilities of a given PHY
interface (what are the supported speed and duplex).

Extract that into phy_caps, but use the link_capa for conversion. Add an
internal phylink helper for the link caps -> mac caps conversion, and
use this in phylink_caps_to_linkmodes().

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/20250307173611.129125-14-maxime.chevallier@bootlin.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 4ca5b8a2

drivers/net/phy/phy-caps.h

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define __PHY_CAPS_H



#include <linux/ethtool.h>

#include <linux/phy.h>



enum {

	LINK_CAPA_10HD = 0,
@@ -32,6 +33,8 @@ enum { 
	__LINK_CAPA_MAX,

};



#define LINK_CAPA_ALL	GENMASK((__LINK_CAPA_MAX - 1), 0)



struct link_capabilities {

	int speed;

	unsigned int duplex;
@@ -45,6 +48,7 @@ size_t phy_caps_speeds(unsigned int *speeds, size_t size, 
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);



const struct link_capabilities *

phy_caps_lookup_by_linkmode(const unsigned long *linkmodes);

drivers/net/phy/phy_caps.c

+92 −0
Original line number Diff line number Diff line
@@ -265,3 +265,95 @@ void phy_caps_linkmodes(unsigned long caps, unsigned long *linkmodes) 
		linkmode_or(linkmodes, linkmodes, link_caps[capa].linkmodes);

}

EXPORT_SYMBOL_GPL(phy_caps_linkmodes);



/**

 * phy_caps_from_interface() - Get the link capa from a given PHY interface

 * @interface: The PHY interface we want to get the possible Speed/Duplex from

 *

 * Returns: A bitmask of LINK_CAPA_xxx values that can be achieved with the

 *          provided interface.

 */

unsigned long phy_caps_from_interface(phy_interface_t interface)

{

	unsigned long link_caps = 0;



	switch (interface) {

	case PHY_INTERFACE_MODE_USXGMII:

		link_caps |= BIT(LINK_CAPA_10000FD) | BIT(LINK_CAPA_5000FD);

		fallthrough;



	case PHY_INTERFACE_MODE_10G_QXGMII:

		link_caps |= BIT(LINK_CAPA_2500FD);

		fallthrough;



	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:

		link_caps |= BIT(LINK_CAPA_1000HD) | BIT(LINK_CAPA_1000FD);

		fallthrough;



	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:

		link_caps |= BIT(LINK_CAPA_10HD) | BIT(LINK_CAPA_10FD);

		fallthrough;



	case PHY_INTERFACE_MODE_100BASEX:

		link_caps |= BIT(LINK_CAPA_100HD) | BIT(LINK_CAPA_100FD);

		break;



	case PHY_INTERFACE_MODE_TBI:

	case PHY_INTERFACE_MODE_MOCA:

	case PHY_INTERFACE_MODE_RTBI:

	case PHY_INTERFACE_MODE_1000BASEX:

		link_caps |= BIT(LINK_CAPA_1000HD);

		fallthrough;

	case PHY_INTERFACE_MODE_1000BASEKX:

	case PHY_INTERFACE_MODE_TRGMII:

		link_caps |= BIT(LINK_CAPA_1000FD);

		break;



	case PHY_INTERFACE_MODE_2500BASEX:

		link_caps |= BIT(LINK_CAPA_2500FD);

		break;



	case PHY_INTERFACE_MODE_5GBASER:

		link_caps |= BIT(LINK_CAPA_5000FD);

		break;



	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:

		link_caps |= BIT(LINK_CAPA_10000FD);

		break;



	case PHY_INTERFACE_MODE_25GBASER:

		link_caps |= BIT(LINK_CAPA_25000FD);

		break;



	case PHY_INTERFACE_MODE_XLGMII:

		link_caps |= BIT(LINK_CAPA_40000FD);

		break;



	case PHY_INTERFACE_MODE_INTERNAL:

		link_caps |= LINK_CAPA_ALL;

		break;



	case PHY_INTERFACE_MODE_NA:

	case PHY_INTERFACE_MODE_MAX:

		break;

	}



	return link_caps;

}

EXPORT_SYMBOL_GPL(phy_caps_from_interface);

drivers/net/phy/phylink.c

+14 −76
Original line number Diff line number Diff line
@@ -335,6 +335,18 @@ static unsigned long phylink_caps_to_link_caps(unsigned long caps) 
	return link_caps;

}



static unsigned long phylink_link_caps_to_mac_caps(unsigned long link_caps)

{

	unsigned long caps = 0;

	int i;



	for (i = 0; i <  ARRAY_SIZE(phylink_caps_params); i++)

		if (link_caps & phylink_caps_params[i].caps_bit)

			caps |= phylink_caps_params[i].mask;



	return caps;

}



/**

 * phylink_caps_to_linkmodes() - Convert capabilities to ethtool link modes

 * @linkmodes: ethtool linkmode mask (must be already initialised)
@@ -412,86 +424,12 @@ static unsigned long phylink_get_capabilities(phy_interface_t interface, 
					      unsigned long mac_capabilities,

					      int rate_matching)

{

	unsigned long link_caps = phy_caps_from_interface(interface);

	int max_speed = phylink_interface_max_speed(interface);

	unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;

	unsigned long matched_caps = 0;



	switch (interface) {

	case PHY_INTERFACE_MODE_USXGMII:

		caps |= MAC_10000FD | MAC_5000FD;

		fallthrough;



	case PHY_INTERFACE_MODE_10G_QXGMII:

		caps |= MAC_2500FD;

		fallthrough;



	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:

		caps |= MAC_1000HD | MAC_1000FD;

		fallthrough;



	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:

		caps |= MAC_10HD | MAC_10FD;

		fallthrough;



	case PHY_INTERFACE_MODE_100BASEX:

		caps |= MAC_100HD | MAC_100FD;

		break;



	case PHY_INTERFACE_MODE_TBI:

	case PHY_INTERFACE_MODE_MOCA:

	case PHY_INTERFACE_MODE_RTBI:

	case PHY_INTERFACE_MODE_1000BASEX:

		caps |= MAC_1000HD;

		fallthrough;

	case PHY_INTERFACE_MODE_1000BASEKX:

	case PHY_INTERFACE_MODE_TRGMII:

		caps |= MAC_1000FD;

		break;



	case PHY_INTERFACE_MODE_2500BASEX:

		caps |= MAC_2500FD;

		break;



	case PHY_INTERFACE_MODE_5GBASER:

		caps |= MAC_5000FD;

		break;



	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:

		caps |= MAC_10000FD;

		break;



	case PHY_INTERFACE_MODE_25GBASER:

		caps |= MAC_25000FD;

		break;



	case PHY_INTERFACE_MODE_XLGMII:

		caps |= MAC_40000FD;

		break;



	case PHY_INTERFACE_MODE_INTERNAL:

		caps |= ~0;

		break;



	case PHY_INTERFACE_MODE_NA:

	case PHY_INTERFACE_MODE_MAX:

		break;

	}

	caps |= phylink_link_caps_to_mac_caps(link_caps);



	switch (rate_matching) {

	case RATE_MATCH_OPEN_LOOP: