[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230406100445.52915-1-arinc.unal@arinc9.com>
Date: Thu, 6 Apr 2023 13:04:45 +0300
From: arinc9.unal@...il.com
To: Sean Wang <sean.wang@...iatek.com>,
Landen Chao <Landen.Chao@...iatek.com>,
DENG Qingfang <dqfext@...il.com>,
Daniel Golle <daniel@...rotopia.org>,
Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <olteanv@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>
Cc: Arınç ÜNAL <arinc.unal@...nc9.com>,
erkin.bozoglu@...ont.com, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org
Subject: [RFC PATCH net-next] net: dsa: mt7530: fix port specifications for MT7988
From: Arınç ÜNAL <arinc.unal@...nc9.com>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6
as the CPU port, there's no port 5. Split the switch statement with a check
to enforce these for the switch on the MT7988 SoC. The internal phy-mode is
specific to MT7988 so put it for MT7988 only.
Signed-off-by: Arınç ÜNAL <arinc.unal@...nc9.com>
---
Daniel, this is based on the information you provided me about the switch.
I will add this to my current patch series if it looks good to you.
Arınç
---
drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++--------------
1 file changed, 43 insertions(+), 24 deletions(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 6fbbdcb5987f..f167fa135ef1 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,
phy_interface_zero(config->supported_interfaces);
switch (port) {
- case 0 ... 4: /* Internal phy */
+ case 0 ... 3: /* Internal phy */
__set_bit(PHY_INTERFACE_MODE_INTERNAL,
config->supported_interfaces);
break;
@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
struct mt7530_priv *priv = ds->priv;
u32 mcr_cur, mcr_new;
- switch (port) {
- case 0 ... 4: /* Internal phy */
- if (state->interface != PHY_INTERFACE_MODE_GMII &&
- state->interface != PHY_INTERFACE_MODE_INTERNAL)
- goto unsupported;
- break;
- case 5: /* Port 5, a CPU port. */
- if (priv->p5_interface == state->interface)
+ if (priv->id == ID_MT7988) {
+ switch (port) {
+ case 0 ... 3: /* Internal phy */
+ if (state->interface != PHY_INTERFACE_MODE_INTERNAL)
+ goto unsupported;
break;
+ case 6: /* Port 6, a CPU port. */
+ if (priv->p6_interface == state->interface)
+ break;
- if (mt753x_mac_config(ds, port, mode, state) < 0)
+ if (mt753x_mac_config(ds, port, mode, state) < 0)
+ goto unsupported;
+
+ priv->p6_interface = state->interface;
+ break;
+ default:
goto unsupported;
+ }
+ } else {
+ switch (port) {
+ case 0 ... 4: /* Internal phy */
+ if (state->interface != PHY_INTERFACE_MODE_GMII)
+ goto unsupported;
+ break;
+ case 5: /* Port 5, a CPU port. */
+ if (priv->p5_interface == state->interface)
+ break;
- if (priv->p5_intf_sel == P5_INTF_SEL_GMAC5 ||
- priv->p5_intf_sel == P5_INTF_SEL_GMAC5_SGMII)
- priv->p5_interface = state->interface;
- break;
- case 6: /* Port 6, a CPU port. */
- if (priv->p6_interface == state->interface)
+ if (mt753x_mac_config(ds, port, mode, state) < 0)
+ goto unsupported;
+
+ if (priv->p5_intf_sel == P5_INTF_SEL_GMAC5 ||
+ priv->p5_intf_sel == P5_INTF_SEL_GMAC5_SGMII)
+ priv->p5_interface = state->interface;
break;
+ case 6: /* Port 6, a CPU port. */
+ if (priv->p6_interface == state->interface)
+ break;
- if (mt753x_mac_config(ds, port, mode, state) < 0)
- goto unsupported;
+ if (mt753x_mac_config(ds, port, mode, state) < 0)
+ goto unsupported;
- priv->p6_interface = state->interface;
- break;
- default:
+ priv->p6_interface = state->interface;
+ break;
+ default:
unsupported:
- dev_err(ds->dev, "%s: unsupported %s port: %i\n",
- __func__, phy_modes(state->interface), port);
- return;
+ dev_err(ds->dev, "%s: unsupported %s port: %i\n",
+ __func__, phy_modes(state->interface), port);
+ return;
+ }
}
mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
--
2.37.2
Powered by blists - more mailing lists