| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 |
- From a9544caa482a7ed215117a902f04185216997831 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
- Date: Fri, 1 Mar 2024 12:43:04 +0200
- Subject: [PATCH 44/48] net: dsa: mt7530: sort link settings ops and force link
- down on all ports
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- 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: Vladimir Oltean <[email protected]>
- Signed-off-by: Arınç ÜNAL <[email protected]>
- Signed-off-by: Paolo Abeni <[email protected]>
- ---
- drivers/net/dsa/mt7530.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
- --- a/drivers/net/dsa/mt7530.c
- +++ b/drivers/net/dsa/mt7530.c
- @@ -1047,7 +1047,6 @@ mt7530_port_enable(struct dsa_switch *ds
- 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);
-
- @@ -1067,7 +1066,6 @@ mt7530_port_disable(struct dsa_switch *d
- 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);
- }
- @@ -2284,6 +2282,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);
- @@ -2386,6 +2390,12 @@ mt7531_setup_common(struct dsa_switch *d
- 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);
|
