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

net: dsa: ar9331: convert to phylink_generic_validate() 



Populate the supported interfaces and MAC capabilities for the AR9331
DSA switch and remove the old validate implementation to allow DSA to
use phylink_generic_validate() for this switch driver.

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

drivers/net/dsa/qca/ar9331.c

+10 −35
Original line number Diff line number Diff line
@@ -499,52 +499,27 @@ static enum dsa_tag_protocol ar9331_sw_get_tag_protocol(struct dsa_switch *ds, 
	return DSA_TAG_PROTO_AR9331;

}



static void ar9331_sw_phylink_validate(struct dsa_switch *ds, int port,

				       unsigned long *supported,

				       struct phylink_link_state *state)

static void ar9331_sw_phylink_get_caps(struct dsa_switch *ds, int port,

				       struct phylink_config *config)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };

	config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

		MAC_10 | MAC_100;



	switch (port) {

	case 0:

		if (state->interface != PHY_INTERFACE_MODE_GMII)

			goto unsupported;



		phylink_set(mask, 1000baseT_Full);

		phylink_set(mask, 1000baseT_Half);

		__set_bit(PHY_INTERFACE_MODE_GMII,

			  config->supported_interfaces);

		config->mac_capabilities |= MAC_1000;

		break;

	case 1:

	case 2:

	case 3:

	case 4:

	case 5:

		if (state->interface != PHY_INTERFACE_MODE_INTERNAL)

			goto unsupported;

		__set_bit(PHY_INTERFACE_MODE_INTERNAL,

			  config->supported_interfaces);

		break;

	default:

		linkmode_zero(supported);

		dev_err(ds->dev, "Unsupported port: %i\n", port);

		return;

	}



	phylink_set_port_modes(mask);

	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);



	linkmode_and(supported, supported, mask);

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



	return;



unsupported:

	linkmode_zero(supported);

	dev_err(ds->dev, "Unsupported interface: %d, port: %d\n",

		state->interface, port);

}



static void ar9331_sw_phylink_mac_config(struct dsa_switch *ds, int port,
@@ -697,7 +672,7 @@ static const struct dsa_switch_ops ar9331_sw_ops = { 
	.get_tag_protocol	= ar9331_sw_get_tag_protocol,

	.setup			= ar9331_sw_setup,

	.port_disable		= ar9331_sw_port_disable,

	.phylink_validate	= ar9331_sw_phylink_validate,

	.phylink_get_caps	= ar9331_sw_phylink_get_caps,

	.phylink_mac_config	= ar9331_sw_phylink_mac_config,

	.phylink_mac_link_down	= ar9331_sw_phylink_mac_link_down,

	.phylink_mac_link_up	= ar9331_sw_phylink_mac_link_up,