1 From 1ca89c2e349d7c5e045911d741dacf4c83d029e7 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
3 Date: Fri, 1 Mar 2024 12:43:05 +0200
4 Subject: [PATCH 27/30] net: dsa: mt7530: simplify link operations
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 The "MT7621 Giga Switch Programming Guide v0.3", "MT7531 Reference Manual
10 for Development Board v1.0", and "MT7988A Wi-Fi 7 Generation Router
11 Platform: Datasheet (Open Version) v0.1" documents show that these bits are
14 PMCR_IFG_XMIT(1) (not part of PMCR_LINK_SETTINGS_MASK)
15 PMCR_MAC_MODE (not part of PMCR_LINK_SETTINGS_MASK)
18 PMCR_BACKOFF_EN (not part of PMCR_LINK_SETTINGS_MASK)
19 PMCR_BACKPR_EN (not part of PMCR_LINK_SETTINGS_MASK)
23 These bits also don't exist on the MT7530_PMCR_P(6) register of the switch
31 Remove the setting of the bits not part of PMCR_LINK_SETTINGS_MASK on
32 phylink_mac_config as they're already set.
34 The bit for setting the port on force mode is already done on
35 mt7530_setup() and mt7531_setup_common(). So get rid of
36 PMCR_FORCE_MODE_ID() which helped determine which bit to use for the switch
39 Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
40 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
42 drivers/net/dsa/mt7530.c | 12 +-----------
43 drivers/net/dsa/mt7530.h | 2 --
44 2 files changed, 1 insertion(+), 13 deletions(-)
46 --- a/drivers/net/dsa/mt7530.c
47 +++ b/drivers/net/dsa/mt7530.c
48 @@ -2880,23 +2880,13 @@ mt753x_phylink_mac_config(struct dsa_swi
49 const struct phylink_link_state *state)
51 struct mt7530_priv *priv = ds->priv;
52 - u32 mcr_cur, mcr_new;
54 if ((port == 5 || port == 6) && priv->info->mac_port_config)
55 priv->info->mac_port_config(ds, port, mode, state->interface);
57 - mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
59 - mcr_new &= ~PMCR_LINK_SETTINGS_MASK;
60 - mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
61 - PMCR_BACKPR_EN | PMCR_FORCE_MODE_ID(priv->id);
63 /* Are we connected to external phy */
64 if (port == 5 && dsa_is_user_port(ds, 5))
65 - mcr_new |= PMCR_EXT_PHY;
67 - if (mcr_new != mcr_cur)
68 - mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
69 + mt7530_set(priv, MT7530_PMCR_P(port), PMCR_EXT_PHY);
72 static void mt753x_phylink_mac_link_down(struct dsa_switch *ds, int port,
73 --- a/drivers/net/dsa/mt7530.h
74 +++ b/drivers/net/dsa/mt7530.h
75 @@ -333,8 +333,6 @@ enum mt7530_vlan_port_acc_frm {
77 MT7531_FORCE_RX_FC | \
79 -#define PMCR_FORCE_MODE_ID(id) ((((id) == ID_MT7531) || ((id) == ID_MT7988)) ? \
80 - MT7531_FORCE_MODE : PMCR_FORCE_MODE)
81 #define PMCR_LINK_SETTINGS_MASK (PMCR_TX_EN | PMCR_FORCE_SPEED_1000 | \
82 PMCR_RX_EN | PMCR_FORCE_SPEED_100 | \
83 PMCR_TX_FC_EN | PMCR_RX_FC_EN | \