Commit ec8582d1 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: sja1105: move MAC configuration to .phylink_mac_link_up 



The switches supported so far by the driver only have non-SerDes ports,
so they should be configured in the PHYLINK callback that provides the
resolved PHY link parameters.

Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 724d0215

drivers/net/dsa/sja1105/sja1105_main.c

+9 −4
Original line number Diff line number Diff line
@@ -765,15 +765,16 @@ static void sja1105_mac_config(struct dsa_switch *ds, int port, 
{

	struct sja1105_private *priv = ds->priv;



	if (sja1105_phy_mode_mismatch(priv, port, state->interface))

	if (sja1105_phy_mode_mismatch(priv, port, state->interface)) {

		dev_err(ds->dev, "Changing PHY mode to %s not supported!\n",

			phy_modes(state->interface));

		return;

	}



	if (link_an_mode == MLO_AN_INBAND) {

		dev_err(ds->dev, "In-band AN not supported!\n");

		return;

	}



	sja1105_adjust_port_config(priv, port, state->speed);

}



static void sja1105_mac_link_down(struct dsa_switch *ds, int port,
@@ -790,7 +791,11 @@ static void sja1105_mac_link_up(struct dsa_switch *ds, int port, 
				int speed, int duplex,

				bool tx_pause, bool rx_pause)

{

	sja1105_inhibit_tx(ds->priv, BIT(port), false);

	struct sja1105_private *priv = ds->priv;



	sja1105_adjust_port_config(priv, port, speed);



	sja1105_inhibit_tx(priv, BIT(port), false);

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE