Commit 04a0683f authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: stmmac: convert to phylink_generic_validate() 



Convert stmmac to use phylink_generic_validate() now that we have the
MAC capabilities and supported interfaces filled in, and we have the
PCS validation handled via the PCS operations.

Tested-by: default avatarWong Vee Khee &lt;vee.khee.wong@linux.intel.com&gt; # Intel EHL Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4c296c9

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −24
Original line number Diff line number Diff line
@@ -936,29 +936,6 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex) 
			priv->pause, tx_cnt);

}



static void stmmac_validate(struct phylink_config *config,

			    unsigned long *supported,

			    struct phylink_link_state *state)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mac_supported) = { 0, };



	/* This is very similar to phylink_generic_validate() except that

	 * we always use PHY_INTERFACE_MODE_INTERNAL to get all capabilities.

	 * This is because we don't always have config->supported_interfaces

	 * populated (only when we have the XPCS.)

	 *

	 * When we do have an XPCS, we could pass state->interface, as XPCS

	 * limits to a subset of the ethtool link modes allowed here.

	 */

	phylink_set(mac_supported, Autoneg);

	phylink_set_port_modes(mac_supported);

	phylink_get_linkmodes(mac_supported, PHY_INTERFACE_MODE_INTERNAL,

			      config->mac_capabilities);



	linkmode_and(supported, supported, mac_supported);

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

}



static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,

			      const struct phylink_link_state *state)

{
@@ -1095,7 +1072,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, 
}



static const struct phylink_mac_ops stmmac_phylink_mac_ops = {

	.validate = stmmac_validate,

	.validate = phylink_generic_validate,

	.mac_config = stmmac_mac_config,

	.mac_link_down = stmmac_mac_link_down,

	.mac_link_up = stmmac_mac_link_up,