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

net: mvpp2: remove interface checks in mvpp2_phylink_validate() 



As phylink checks the interface mode against the supported_interfaces
bitmap, we no longer need to validate the interface mode in the
validation function. Remove this to simplify it.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8498e17e

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+7 −26
Original line number Diff line number Diff line
@@ -6261,32 +6261,13 @@ static void mvpp2_phylink_validate(struct phylink_config *config, 
	struct mvpp2_port *port = mvpp2_phylink_to_port(config);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };



	/* Invalid combinations */

	switch (state->interface) {

	case PHY_INTERFACE_MODE_10GBASER:

	case PHY_INTERFACE_MODE_XAUI:

		if (!mvpp2_port_supports_xlg(port))

			goto empty_set;

		break;

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID:

	case PHY_INTERFACE_MODE_RGMII_RXID:

	case PHY_INTERFACE_MODE_RGMII_TXID:

		if (!mvpp2_port_supports_rgmii(port))

			goto empty_set;

		break;

	case PHY_INTERFACE_MODE_1000BASEX:

	case PHY_INTERFACE_MODE_2500BASEX:

	/* 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 (!phylink_test(state->advertising, Autoneg))

	if (phy_interface_mode_is_8023z(state->interface) &&

	    !phylink_test(state->advertising, Autoneg))

		goto empty_set;

		break;

	default:

		break;

	}



	phylink_set(mask, Autoneg);

	phylink_set_port_modes(mask);