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

Merge branch 'ocelot_net-phylink' 



Russell King says:

====================
net: ocelot_net: phylink validate implementation updates

This series converts ocelot_net 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 c11239f3 7258aa50

drivers/net/ethernet/mscc/ocelot_net.c

+6 −35
Original line number Diff line number Diff line
@@ -1498,40 +1498,6 @@ struct notifier_block ocelot_switchdev_blocking_nb __read_mostly = { 
	.notifier_call = ocelot_switchdev_blocking_event,

};



static void vsc7514_phylink_validate(struct phylink_config *config,

				     unsigned long *supported,

				     struct phylink_link_state *state)

{

	struct net_device *ndev = to_net_dev(config->dev);

	struct ocelot_port_private *priv = netdev_priv(ndev);

	struct ocelot_port *ocelot_port = &priv->port;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = {};



	if (state->interface != PHY_INTERFACE_MODE_NA &&

	    state->interface != ocelot_port->phy_mode) {

		linkmode_zero(supported);

		return;

	}



	phylink_set_port_modes(mask);



	phylink_set(mask, Pause);

	phylink_set(mask, Autoneg);

	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, 1000baseT_Half);

	phylink_set(mask, 1000baseT_Full);

	phylink_set(mask, 1000baseX_Full);

	phylink_set(mask, 2500baseT_Full);

	phylink_set(mask, 2500baseX_Full);



	linkmode_and(supported, supported, mask);

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

}



static void vsc7514_phylink_mac_config(struct phylink_config *config,

				       unsigned int link_an_mode,

				       const struct phylink_link_state *state)
@@ -1590,7 +1556,7 @@ static void vsc7514_phylink_mac_link_up(struct phylink_config *config, 
}



static const struct phylink_mac_ops ocelot_phylink_ops = {

	.validate		= vsc7514_phylink_validate,

	.validate		= phylink_generic_validate,

	.mac_config		= vsc7514_phylink_mac_config,

	.mac_link_down		= vsc7514_phylink_mac_link_down,

	.mac_link_up		= vsc7514_phylink_mac_link_up,
@@ -1654,6 +1620,11 @@ static int ocelot_port_phylink_create(struct ocelot *ocelot, int port, 


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

	priv->phylink_config.type = PHYLINK_NETDEV;

	priv->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

		MAC_10 | MAC_100 | MAC_1000FD | MAC_2500FD;



	__set_bit(ocelot_port->phy_mode,

		  priv->phylink_config.supported_interfaces);



	phylink = phylink_create(&priv->phylink_config,

				 of_fwnode_handle(portnp),