net: dsa: sja1105: move MAC configuration to .phylink_mac_link_up
PATCH 1/1 net: dsa: sja1105: move MAC configuration to .phylink_mac_link_up
From: Vladimir Oltean <[email protected]>
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 Vladimir Oltean <[email protected]>
Signed-off-by Russell King <[email protected]>
--- drivers/net/dsa/sja1105/sja1105_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +9 -4
@@ -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,
Signature · 1 line
2.20.1
From: Russell King <[email protected]>
Date: Thu, 12 Mar 2020 12:19:51 +0000
Quoted 8 lines
From: Vladimir Oltean <[email protected]>
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 Vladimir Oltean <[email protected]>Signed-off-by Russell King <[email protected]>
Applied, thanks.