forked from Minki/linux
net: phylink: add generic validate implementation
Add a generic validate() implementation using the supported_interfaces and a bitmask of MAC pause/speed/duplex capabilities. This allows us to entirely eliminate many driver private validate() implementations. We expose the underlying phylink_get_linkmodes() function so that drivers which have special needs can still benefit from conversion. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King (Oracle)
David S. Miller
parent
5cf46d8e74
commit
34ae2c09d4
@ -166,6 +166,258 @@ static const char *phylink_an_mode_str(unsigned int mode)
|
|||||||
return mode < ARRAY_SIZE(modestr) ? modestr[mode] : "unknown";
|
return mode < ARRAY_SIZE(modestr) ? modestr[mode] : "unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void phylink_caps_to_linkmodes(unsigned long *linkmodes,
|
||||||
|
unsigned long 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);
|
||||||
|
|
||||||
|
if (caps & MAC_10FD)
|
||||||
|
__set_bit(ETHTOOL_LINK_MODE_10baseT_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_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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* phylink_get_linkmodes() - get acceptable link modes
|
||||||
|
* @linkmodes: ethtool linkmode mask (must be already initialised)
|
||||||
|
* @interface: phy interface mode defined by &typedef phy_interface_t
|
||||||
|
* @mac_capabilities: bitmask of MAC capabilities
|
||||||
|
*
|
||||||
|
* Set all possible pause, speed and duplex linkmodes in @linkmodes that
|
||||||
|
* are supported by the @interface mode and @mac_capabilities. @linkmodes
|
||||||
|
* must have been initialised previously.
|
||||||
|
*/
|
||||||
|
void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
|
||||||
|
unsigned long mac_capabilities)
|
||||||
|
{
|
||||||
|
unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
|
||||||
|
|
||||||
|
switch (interface) {
|
||||||
|
case PHY_INTERFACE_MODE_USXGMII:
|
||||||
|
caps |= MAC_10000FD | MAC_5000FD | 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_QSGMII:
|
||||||
|
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_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_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:
|
||||||
|
case PHY_INTERFACE_MODE_SMII:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
phylink_caps_to_linkmodes(linkmodes, caps & mac_capabilities);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(phylink_get_linkmodes);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* phylink_generic_validate() - generic validate() callback implementation
|
||||||
|
* @config: a pointer to a &struct phylink_config.
|
||||||
|
* @supported: ethtool bitmask for supported link modes.
|
||||||
|
* @state: a pointer to a &struct phylink_link_state.
|
||||||
|
*
|
||||||
|
* Generic implementation of the validate() callback that MAC drivers can
|
||||||
|
* use when they pass the range of supported interfaces and MAC capabilities.
|
||||||
|
* This makes use of phylink_get_linkmodes().
|
||||||
|
*/
|
||||||
|
void phylink_generic_validate(struct phylink_config *config,
|
||||||
|
unsigned long *supported,
|
||||||
|
struct phylink_link_state *state)
|
||||||
|
{
|
||||||
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
||||||
|
|
||||||
|
phylink_set_port_modes(mask);
|
||||||
|
phylink_set(mask, Autoneg);
|
||||||
|
phylink_get_linkmodes(mask, state->interface, config->mac_capabilities);
|
||||||
|
|
||||||
|
linkmode_and(supported, supported, mask);
|
||||||
|
linkmode_and(state->advertising, state->advertising, mask);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(phylink_generic_validate);
|
||||||
|
|
||||||
static int phylink_validate_any(struct phylink *pl, unsigned long *supported,
|
static int phylink_validate_any(struct phylink *pl, unsigned long *supported,
|
||||||
struct phylink_link_state *state)
|
struct phylink_link_state *state)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -20,6 +20,29 @@ enum {
|
|||||||
MLO_AN_PHY = 0, /* Conventional PHY */
|
MLO_AN_PHY = 0, /* Conventional PHY */
|
||||||
MLO_AN_FIXED, /* Fixed-link mode */
|
MLO_AN_FIXED, /* Fixed-link mode */
|
||||||
MLO_AN_INBAND, /* In-band protocol */
|
MLO_AN_INBAND, /* In-band protocol */
|
||||||
|
|
||||||
|
MAC_SYM_PAUSE = BIT(0),
|
||||||
|
MAC_ASYM_PAUSE = BIT(1),
|
||||||
|
MAC_10HD = BIT(2),
|
||||||
|
MAC_10FD = BIT(3),
|
||||||
|
MAC_10 = MAC_10HD | MAC_10FD,
|
||||||
|
MAC_100HD = BIT(4),
|
||||||
|
MAC_100FD = BIT(5),
|
||||||
|
MAC_100 = MAC_100HD | MAC_100FD,
|
||||||
|
MAC_1000HD = BIT(6),
|
||||||
|
MAC_1000FD = BIT(7),
|
||||||
|
MAC_1000 = MAC_1000HD | MAC_1000FD,
|
||||||
|
MAC_2500FD = BIT(8),
|
||||||
|
MAC_5000FD = BIT(9),
|
||||||
|
MAC_10000FD = BIT(10),
|
||||||
|
MAC_20000FD = BIT(11),
|
||||||
|
MAC_25000FD = BIT(12),
|
||||||
|
MAC_40000FD = BIT(13),
|
||||||
|
MAC_50000FD = BIT(14),
|
||||||
|
MAC_56000FD = BIT(15),
|
||||||
|
MAC_100000FD = BIT(16),
|
||||||
|
MAC_200000FD = BIT(17),
|
||||||
|
MAC_400000FD = BIT(18),
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline bool phylink_autoneg_inband(unsigned int mode)
|
static inline bool phylink_autoneg_inband(unsigned int mode)
|
||||||
@ -69,6 +92,7 @@ enum phylink_op_type {
|
|||||||
* if MAC link is at %MLO_AN_FIXED mode.
|
* if MAC link is at %MLO_AN_FIXED mode.
|
||||||
* @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx
|
* @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx
|
||||||
* are supported by the MAC/PCS.
|
* are supported by the MAC/PCS.
|
||||||
|
* @mac_capabilities: MAC pause/speed/duplex capabilities.
|
||||||
*/
|
*/
|
||||||
struct phylink_config {
|
struct phylink_config {
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
@ -79,6 +103,7 @@ struct phylink_config {
|
|||||||
void (*get_fixed_state)(struct phylink_config *config,
|
void (*get_fixed_state)(struct phylink_config *config,
|
||||||
struct phylink_link_state *state);
|
struct phylink_link_state *state);
|
||||||
DECLARE_PHY_INTERFACE_MASK(supported_interfaces);
|
DECLARE_PHY_INTERFACE_MASK(supported_interfaces);
|
||||||
|
unsigned long mac_capabilities;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -442,6 +467,12 @@ void pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
|
|||||||
phy_interface_t interface, int speed, int duplex);
|
phy_interface_t interface, int speed, int duplex);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
|
||||||
|
unsigned long mac_capabilities);
|
||||||
|
void phylink_generic_validate(struct phylink_config *config,
|
||||||
|
unsigned long *supported,
|
||||||
|
struct phylink_link_state *state);
|
||||||
|
|
||||||
struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *,
|
struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *,
|
||||||
phy_interface_t iface,
|
phy_interface_t iface,
|
||||||
const struct phylink_mac_ops *mac_ops);
|
const struct phylink_mac_ops *mac_ops);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user