introduce generic phylink validation
Subsystems (6)
PATCH 3/3 net: mvpp2: use phylink_generic_validate()
In reply to Russell King (Oracle)Convert mvpp2 to use phylink_generic_validate() for the bulk of its validate() implementation. This network adapter has a restriction that for 802.3z links, autonegotiation must be enabled.
--- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 58 +++---------------- 1 file changed, 9 insertions(+), 49 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +9 -49
@@ -6260,9 +6260,6 @@ static void mvpp2_phylink_validate(struct phylink_config *config,unsigned long *supported, struct phylink_link_state *state) { - struct mvpp2_port *port = mvpp2_phylink_to_port(config); -__ETHTOOL_DECLARE_LINK_MODE_MASK (mask) = {0 , }; -/* When in 802.3z mode, we must have AN enabled: * Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ... * When <PortType> = 1 (1000BASE-X) this field must be set to 1.
@@ -6271,52 +6268,7 @@ static void mvpp2_phylink_validate(struct phylink_config *config, !phylink_test(state->advertising, Autoneg)) goto empty_set; -phylink_set (mask, Autoneg); -phylink_set_port_modes (mask); - -if (port->priv->global_tx_fc) { -phylink_set (mask, Pause); -phylink_set (mask, Asym_Pause); - } - -switch (state->interface) { -case PHY_INTERFACE_MODE_10GBASER : -case PHY_INTERFACE_MODE_XAUI : -if (mvpp2_port_supports_xlg (port)) { -phylink_set_10g_modes (mask); - phylink_set(mask, 10000baseKR_Full); - } -break ; - -case PHY_INTERFACE_MODE_RGMII : -case PHY_INTERFACE_MODE_RGMII_ID : -case PHY_INTERFACE_MODE_RGMII_RXID : -case PHY_INTERFACE_MODE_RGMII_TXID : -case PHY_INTERFACE_MODE_SGMII : - phylink_set(mask, 10baseT_Half); - phylink_set(mask, 10baseT_Full); - phylink_set(mask, 100baseT_Half); - phylink_set(mask, 100baseT_Full); - phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseX_Full); -break ; - -case PHY_INTERFACE_MODE_1000BASEX : - phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseX_Full); -break ; - -case PHY_INTERFACE_MODE_2500BASEX : - phylink_set(mask, 2500baseT_Full); - phylink_set(mask, 2500baseX_Full); -break ; - -default : - goto empty_set; - } - -linkmode_and (supported, supported, mask); -linkmode_and (state->advertising, state->advertising, mask); +phylink_generic_validate (config, supported, state);return ; empty_set:
@@ -6911,12 +6863,20 @@ static int mvpp2_port_probe(struct platform_device *pdev,if (!mvpp2_use_acpi_compat_mode (port_fwnode)) { port->phylink_config.dev = &dev->dev; port->phylink_config.type =PHYLINK_NETDEV ; + port->phylink_config.mac_capabilities = +MAC_2500FD |MAC_1000FD |MAC_100 |MAC_10 ; + +if (port->priv->global_tx_fc) + port->phylink_config.mac_capabilities |= +MAC_SYM_PAUSE |MAC_ASYM_PAUSE ;if (mvpp2_port_supports_xlg (port)) {__set_bit (PHY_INTERFACE_MODE_10GBASER , port->phylink_config.supported_interfaces);__set_bit (PHY_INTERFACE_MODE_XAUI , port->phylink_config.supported_interfaces); + port->phylink_config.mac_capabilities |= +MAC_10000FD ; }if (mvpp2_port_supports_rgmii (port))
Signature · 1 line
2.30.2
PATCH 1/3 net: phylink: add generic validate implementation
In reply to Russell King (Oracle)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.
--- drivers/net/phy/phylink.c | 252 ++++++++++++++++++++++++++++++++++++++ include/linux/phylink.h | 31 +++++ 2 files changed, 283 insertions(+)
drivers/net/phy/phylink.c +252 -0
@@ -166,6 +166,258 @@ static const char *phylink_an_mode_str(unsigned int mode)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,struct phylink_link_state *state) {
include/linux/phylink.h +31 -0
@@ -20,6 +20,29 @@ enum {MLO_AN_PHY =0 ,/* Conventional PHY */ MLO_AN_FIXED ,/* Fixed-link mode */ 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)
@@ -69,6 +92,7 @@ enum phylink_op_type {* if MAC link is at %MLO_AN_FIXED mode. * @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx * are supported by the MAC/PCS. +* @mac_capabilities: MAC pause/speed/duplex capabilities. */ struct phylink_config {struct device *dev;
@@ -79,6 +103,7 @@ struct phylink_config {void (*get_fixed_state)(struct phylink_config *config,struct phylink_link_state *state);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);#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 *,phy_interface_t iface,const struct phylink_mac_ops *mac_ops);
Signature · 1 line
2.30.2
PATCH 2/3 net: mvneta: use phylink_generic_validate()
In reply to Russell King (Oracle)Convert mvneta to use phylink_generic_validate() for the bulk of its validate() implementation. This network adapter has a restriction that for 802.3z links, autonegotiation must be enabled.
--- drivers/net/ethernet/marvell/mvneta.c | 34 ++++----------------------- 1 file changed, 4 insertions(+), 30 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +4 -30
@@ -3823,8 +3823,6 @@ static void mvneta_validate(struct phylink_config *config,unsigned long *supported, struct phylink_link_state *state) { -__ETHTOOL_DECLARE_LINK_MODE_MASK (mask ) = {0 , }; -/* We only support QSGMII, SGMII, 802.3z and RGMII modes. * When in 802.3z mode, we must have AN enabled: * "Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ...
@@ -3836,34 +3834,7 @@ static void mvneta_validate(struct phylink_config *config,return ; } -/* Allow all the expected bits */ -phylink_set (mask, Autoneg); -phylink_set_port_modes (mask); - -/* Asymmetric pause is unsupported */ -phylink_set (mask, Pause); - -/* Half-duplex at speeds higher than 100Mbit is unsupported */ -if (state->interface !=PHY_INTERFACE_MODE_2500BASEX ) { - phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseX_Full); - } - -if (state->interface ==PHY_INTERFACE_MODE_2500BASEX ) { - phylink_set(mask, 2500baseT_Full); - phylink_set(mask, 2500baseX_Full); - } - -if (!phy_interface_mode_is_8023z (state->interface)) { -/* 10M and 100M are only supported in non-802.3z mode */ - phylink_set(mask, 10baseT_Half); - phylink_set(mask, 10baseT_Full); - phylink_set(mask, 100baseT_Half); - phylink_set(mask, 100baseT_Full); - } - -linkmode_and (supported, supported, mask); -linkmode_and (state->advertising, state->advertising, mask); +phylink_generic_validate (config, supported, state); } static void mvneta_mac_pcs_get_state(struct phylink_config *config,
@@ -5166,6 +5137,9 @@ static int mvneta_probe(struct platform_device *pdev) pp->phylink_config.dev = &dev->dev; pp->phylink_config.type =PHYLINK_NETDEV ; + pp->phylink_config.mac_capabilities =MAC_SYM_PAUSE |MAC_10 | +MAC_100 |MAC_1000FD |MAC_2500FD ; +phy_interface_set_rgmii (pp->phylink_config.supported_interfaces);__set_bit (PHY_INTERFACE_MODE_QSGMII , pp->phylink_config.supported_interfaces);
Signature · 1 line
2.30.2
Russell King (Oracle)
maintainercover introduce generic phylink validation
Hi,
The various validate method implementations we have in phylink users have been quite repetitive but also prone to bugs. These patches introduce a generic implementation which relies solely on the supported_interfaces bitmap introduced during last cycle, and in the first patch, a bit array of MAC capabilities.
MAC drivers are free to continue to do their own thing if they have special requirements - such as mvneta and mvpp2 which do not support 1000base-X without AN enabled. Most implementations currently in the kernel can be converted to call phylink_generic_validate() directly from the phylink MAC operations structure once they fill in the supported_interfaces and mac_capabilities members of phylink_config.
This series introduces the generic implementation, and converts mvneta and mvpp2 to use it.
drivers/net/ethernet/marvell/mvneta.c | 34 +--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 58 +----- drivers/net/phy/phylink.c | 252 ++++++++++++++++++++++++ include/linux/phylink.h | 31 +++ 4 files changed, 296 insertions(+), 79 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Mon, 15 Nov 2021 09:59:57 +0000 you wrote:
Hi,
The various validate method implementations we have in phylink users have been quite repetitive but also prone to bugs. These patches introduce a generic implementation which relies solely on the
supported_interfacesbitmap introduced during last cycle, and in the first patch, a bit array of MAC capabilities.[...]
Here is the summary with links:
- [net-next,1/3] net: phylink: add generic validate implementation
https://git.kernel.org/netdev/net-next/c/34ae2c09d46a - [net-next,2/3] net: mvneta: use phylink_generic_validate() https://git.kernel.org/netdev/net-next/c/02a0988b9893 - [net-next,3/3] net: mvpp2: use phylink_generic_validate() https://git.kernel.org/netdev/net-next/c/5038ffea0c6c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Andrew Lunn
maintainerRe: [PATCH net-next 1/3] net: phylink: add generic validate implementation
In reply to Russell King (Oracle)Hi Russell
drivers/net/phy/phylink.c static const char *phylink_an_mode_str(unsigned int mode) · line 350
Quoted 3 lines
drivers/net/phy/phylink.c +3
-0+case PHY_INTERFACE_MODE_TBI : +case PHY_INTERFACE_MODE_MOCA : +case PHY_INTERFACE_MODE_RTBI :
For some reason, i think one of these can do 2.5G. But i cannot remember where i have seen this. Maybe b53?
Andrew
Russell King (Oracle)
maintainerRe: [PATCH net-next 1/3] net: phylink: add generic validate implementation
Quoted 8 lines · Andrew Lunn
Hi Russell
drivers/net/phy/phylink.c static const char *phylink_an_mode_str(unsigned int mode) · line 350
Quoted 3 lines
drivers/net/phy/phylink.c +3
-0+case PHY_INTERFACE_MODE_TBI : +case PHY_INTERFACE_MODE_MOCA : +case PHY_INTERFACE_MODE_RTBI :For some reason, i think one of these can do 2.5G. But i cannot remember where i have seen this. Maybe b53?
I asked Florian about MoCA, who said "1G, and then the MoCA Ethernet adaptation layer will do what it can" - I did trip over some information that suggests that could do 2.5G.
However, none of the drivers I've converted make use of these, so if these interface modes need other speeds added, it won't be a problem just yet and can be addressed later.
I haven't addressed DSA yet - DSA drivers don't have the same signature for their validate() implementations, so it is harder to have a generic implementation there without more wrapping. It would also need changing the phylink_get_interfaces method introduced last time around since DSA drivers need to set both the supported_interfaces and mac_capabilities members in phylink_config. So this rules out b53 conversion for the moment, but it would be really nice to also have DSA drivers converted.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!