Commit 6324230b authored by Arınç ÜNAL's avatar Arınç ÜNAL Committed by Paolo Abeni
Browse files

net: dsa: mt7530: sort link settings ops and force link down on all ports 



port_enable and port_disable clears the link settings. Move that to
mt7530_setup() and mt7531_setup_common() which set up the switches. This
way, the link settings are cleared on all ports at setup, and then only
once with phylink_mac_link_down() when a link goes down.

Enable force mode at setup to apply the force part of the link settings.
This ensures that disabled ports will have their link down.

Suggested-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3a87131e

drivers/net/dsa/mt7530.c

+12 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,6 @@ mt7530_port_enable(struct dsa_switch *ds, int port, 
	priv->ports[port].enable = true;

	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,

		   priv->ports[port].pm);

	mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK);



	mutex_unlock(&priv->reg_mutex);
@@ -1038,7 +1037,6 @@ mt7530_port_disable(struct dsa_switch *ds, int port) 
	priv->ports[port].enable = false;

	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,

		   PCR_MATRIX_CLR);

	mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK);



	mutex_unlock(&priv->reg_mutex);

}
@@ -2257,6 +2255,12 @@ mt7530_setup(struct dsa_switch *ds) 
	mt7530_mib_reset(ds);



	for (i = 0; i < MT7530_NUM_PORTS; i++) {

		/* Clear link settings and enable force mode to force link down

		 * on all ports until they're enabled later.

		 */

		mt7530_rmw(priv, MT7530_PMCR_P(i), PMCR_LINK_SETTINGS_MASK |

			   PMCR_FORCE_MODE, PMCR_FORCE_MODE);



		/* Disable forwarding by default on all ports */

		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,

			   PCR_MATRIX_CLR);
@@ -2359,6 +2363,12 @@ mt7531_setup_common(struct dsa_switch *ds) 
		     UNU_FFP_MASK);



	for (i = 0; i < MT7530_NUM_PORTS; i++) {

		/* Clear link settings and enable force mode to force link down

		 * on all ports until they're enabled later.

		 */

		mt7530_rmw(priv, MT7530_PMCR_P(i), PMCR_LINK_SETTINGS_MASK |

			   MT7531_FORCE_MODE, MT7531_FORCE_MODE);



		/* Disable forwarding by default on all ports */

		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,

			   PCR_MATRIX_CLR);