Commit d3a41000 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'enetc-phylink' 



Russell King says:

====================
net: enetc: phylink validate implementation updates

This series converts enetc to fill in the supported_interfaces member
of phylink_config, cleans up the validate() implementation, and then
converts to phylink_generic_validate().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 02ccdd9d 75021cf0

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+13 −40
Original line number Diff line number Diff line
@@ -930,45 +930,6 @@ static void enetc_mdiobus_destroy(struct enetc_pf *pf) 
	enetc_imdio_remove(pf);

}



static void enetc_pl_mac_validate(struct phylink_config *config,

				  unsigned long *supported,

				  struct phylink_link_state *state)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };



	if (state->interface != PHY_INTERFACE_MODE_NA &&

	    state->interface != PHY_INTERFACE_MODE_INTERNAL &&

	    state->interface != PHY_INTERFACE_MODE_SGMII &&

	    state->interface != PHY_INTERFACE_MODE_2500BASEX &&

	    state->interface != PHY_INTERFACE_MODE_USXGMII &&

	    !phy_interface_mode_is_rgmii(state->interface)) {

		linkmode_zero(supported);

		return;

	}



	phylink_set_port_modes(mask);

	phylink_set(mask, Autoneg);

	phylink_set(mask, Pause);

	phylink_set(mask, Asym_Pause);

	phylink_set(mask, 10baseT_Half);

	phylink_set(mask, 10baseT_Full);

	phylink_set(mask, 100baseT_Half);

	phylink_set(mask, 100baseT_Full);

	phylink_set(mask, 100baseT_Half);

	phylink_set(mask, 1000baseT_Half);

	phylink_set(mask, 1000baseT_Full);



	if (state->interface == PHY_INTERFACE_MODE_INTERNAL ||

	    state->interface == PHY_INTERFACE_MODE_2500BASEX ||

	    state->interface == PHY_INTERFACE_MODE_USXGMII) {

		phylink_set(mask, 2500baseT_Full);

		phylink_set(mask, 2500baseX_Full);

	}



	linkmode_and(supported, supported, mask);

	linkmode_and(state->advertising, state->advertising, mask);

}



static void enetc_pl_mac_config(struct phylink_config *config,

				unsigned int mode,

				const struct phylink_link_state *state)
@@ -1096,7 +1057,7 @@ static void enetc_pl_mac_link_down(struct phylink_config *config, 
}



static const struct phylink_mac_ops enetc_mac_phylink_ops = {

	.validate = enetc_pl_mac_validate,

	.validate = phylink_generic_validate,

	.mac_config = enetc_pl_mac_config,

	.mac_link_up = enetc_pl_mac_link_up,

	.mac_link_down = enetc_pl_mac_link_down,
@@ -1111,6 +1072,18 @@ static int enetc_phylink_create(struct enetc_ndev_priv *priv, 


	pf->phylink_config.dev = &priv->ndev->dev;

	pf->phylink_config.type = PHYLINK_NETDEV;

	pf->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

		MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;



	__set_bit(PHY_INTERFACE_MODE_INTERNAL,

		  pf->phylink_config.supported_interfaces);

	__set_bit(PHY_INTERFACE_MODE_SGMII,

		  pf->phylink_config.supported_interfaces);

	__set_bit(PHY_INTERFACE_MODE_2500BASEX,

		  pf->phylink_config.supported_interfaces);

	__set_bit(PHY_INTERFACE_MODE_USXGMII,

		  pf->phylink_config.supported_interfaces);

	phy_interface_set_rgmii(pf->phylink_config.supported_interfaces);



	phylink = phylink_create(&pf->phylink_config, of_fwnode_handle(node),

				 pf->if_mode, &enetc_mac_phylink_ops);