niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: mvneta: convert to pcs_validate() and phylink_generic_validate()

Browse source 
Convert mvneta to validate the autoneg state for 1000base-X in the
pcs_validate() operation, rather than the MAC validate() operation.
This allows us to switch the MAC validate() to use
phylink_generic_validate().

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-12-15 15:34:45 +00:00 • committed by David S. Miller
parent c2e7d2df4a
commit d8c3669397
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/net/ethernet/marvell/mvneta.c
View file

@ -3852,6 +3852,22 @@ static struct mvneta_port *mvneta_pcs_to_port(struct phylink_pcs *pcs)
return container_of(pcs, struct mvneta_port, phylink_pcs); return container_of(pcs, struct mvneta_port, phylink_pcs);
} }
static int mvneta_pcs_validate(struct phylink_pcs *pcs,
unsigned long *supported,
const struct phylink_link_state *state)
{
/* 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. ...
* When <PortType> = 1 (1000BASE-X) this field must be set to 1."
*/
if (phy_interface_mode_is_8023z(state->interface) &&
!phylink_test(state->advertising, Autoneg))
return -EINVAL;
return 0;
}
static void mvneta_pcs_get_state(struct phylink_pcs *pcs, static void mvneta_pcs_get_state(struct phylink_pcs *pcs,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
@ -3947,29 +3963,12 @@ static void mvneta_pcs_an_restart(struct phylink_pcs *pcs)
} }
static const struct phylink_pcs_ops mvneta_phylink_pcs_ops = { static const struct phylink_pcs_ops mvneta_phylink_pcs_ops = {
.pcs_validate = mvneta_pcs_validate,
.pcs_get_state = mvneta_pcs_get_state, .pcs_get_state = mvneta_pcs_get_state,
.pcs_config = mvneta_pcs_config, .pcs_config = mvneta_pcs_config,
.pcs_an_restart = mvneta_pcs_an_restart, .pcs_an_restart = mvneta_pcs_an_restart,
}; };
static void mvneta_validate(struct phylink_config *config,
unsigned long *supported,
struct phylink_link_state *state)
{
/* 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. ...
* When <PortType> = 1 (1000BASE-X) this field must be set to 1."
*/
if (phy_interface_mode_is_8023z(state->interface) &&
!phylink_test(state->advertising, Autoneg)) {
linkmode_zero(supported);
return;
}
phylink_generic_validate(config, supported, state);
}
static int mvneta_mac_prepare(struct phylink_config *config, unsigned int mode, static int mvneta_mac_prepare(struct phylink_config *config, unsigned int mode,
phy_interface_t interface) phy_interface_t interface)
{ {
@ -4176,7 +4175,7 @@ static void mvneta_mac_link_up(struct phylink_config *config,
} }
static const struct phylink_mac_ops mvneta_phylink_ops = { static const struct phylink_mac_ops mvneta_phylink_ops = {
.validate = mvneta_validate, .validate = phylink_generic_validate,
.mac_prepare = mvneta_mac_prepare, .mac_prepare = mvneta_mac_prepare,
.mac_config = mvneta_mac_config, .mac_config = mvneta_mac_config,
.mac_finish = mvneta_mac_finish, .mac_finish = mvneta_mac_finish,