leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: mvneta: use phylink_generic_validate()

Browse Source 
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.

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) 2021-11-15 10:00:32 +00:00 committed by David S. Miller
parent 34ae2c09d4
commit 02a0988b98
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/ethernet/marvell/mvneta.c
View File

@ -3823,8 +3823,6 @@ static void mvneta_validate(struct phylink_config *config,
unsigned long *supported, unsigned long *supported,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
/* We only support QSGMII, SGMII, 802.3z and RGMII modes. /* We only support QSGMII, SGMII, 802.3z and RGMII modes.
* When in 802.3z mode, we must have AN enabled: * When in 802.3z mode, we must have AN enabled:
* "Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ... * "Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ...
@ -3836,34 +3834,7 @@ static void mvneta_validate(struct phylink_config *config,
return; return;
} }
/* Allow all the expected bits */ phylink_generic_validate(config, supported, state);
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);
} }
static void mvneta_mac_pcs_get_state(struct phylink_config *config, 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.dev = &dev->dev;
pp->phylink_config.type = PHYLINK_NETDEV; 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); phy_interface_set_rgmii(pp->phylink_config.supported_interfaces);
__set_bit(PHY_INTERFACE_MODE_QSGMII, __set_bit(PHY_INTERFACE_MODE_QSGMII,
pp->phylink_config.supported_interfaces); pp->phylink_config.supported_interfaces);