From: "René van Dorst" <opensource@vdorst.com>
To: sean.wang@mediatek.com, f.fainelli@gmail.com,
linux@armlinux.org.uk, davem@davemloft.net,
matthias.bgg@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com
Cc: frank-w@public-files.de, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-mips@vger.kernel.org,
"René van Dorst" <opensource@vdorst.com>
Subject: [PATCH RFC net-next 5/5] net: dsa: mt7530: Add mediatek,ephy-handle to isolate external phy
Date: Mon, 24 Jun 2019 16:52:51 +0200 [thread overview]
Message-ID: <20190624145251.4849-6-opensource@vdorst.com> (raw)
In-Reply-To: <20190624145251.4849-1-opensource@vdorst.com>
On some platforms the external phy can only interface with the port 5 of
the switch because the xMII TX and RX lines are swapped. But it still can
be useful to use the internal phy of the switch to act as a WAN port which
connectes to the 2nd GMAC. This gives the SOC a double the bandwidth
between LAN and WAN. Because LAN and WAN don't share the same interface
anymore.
By adding an optional property mediatek,ephy-handle, the external phy
is put in isolation mode when internal phy is linked with 2nd GMAC via
phy-handle property.
Signed-off-by: René van Dorst <opensource@vdorst.com>
---
drivers/net/dsa/mt7530.c | 28 ++++++++++++++++++++++++++++
drivers/net/dsa/mt7530.h | 2 ++
2 files changed, 30 insertions(+)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 838a921ca83e..25b0f35df75b 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -633,6 +633,26 @@ mt7530_get_sset_count(struct dsa_switch *ds, int port, int sset)
return ARRAY_SIZE(mt7530_mib);
}
+static int mt7530_isolate_ephy(struct dsa_switch *ds,
+ struct device_node *ephy_node)
+{
+ struct phy_device *phydev = of_phy_find_device(ephy_node);
+ int ret;
+
+ if (!phydev)
+ return 0;
+
+ ret = phy_modify(phydev, MII_BMCR, 0, (BMCR_ISOLATE | BMCR_PDOWN));
+ if (ret)
+ dev_err(ds->dev, "Failed to put phy %s in isolation mode!\n",
+ ephy_node->full_name);
+ else
+ dev_info(ds->dev, "Phy %s in isolation mode!\n",
+ ephy_node->full_name);
+
+ return ret;
+}
+
static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
{
struct mt7530_priv *priv = ds->priv;
@@ -655,6 +675,10 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
/* MT7530_P5_MODE_GPHY_P4: 2nd GMAC -> P5 -> P4 */
val &= ~MHWTRAP_P5_MAC_SEL & ~MHWTRAP_P5_DIS;
+ /* Isolate the external phy */
+ if (priv->ephy_node)
+ if (mt7530_isolate_ephy(ds, priv->ephy_node) < 0)
+ goto unlock_exit;
/* Setup the MAC by default for the cpu port */
mt7530_write(priv, MT7530_PMCR_P(5), 0x56300);
break;
@@ -1330,6 +1354,10 @@ mt7530_setup(struct dsa_switch *ds)
mt7530_port_disable(ds, i);
}
+ /* Get external phy phandle */
+ priv->ephy_node = of_parse_phandle(priv->dev->of_node,
+ "mediatek,ephy-handle", 0);
+
/* Setup port 5 */
priv->p5_mode = P5_MODE_DISABLED;
interface = PHY_INTERFACE_MODE_NA;
diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index f2a84ef48548..eb079e81a8e8 100644
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -459,6 +459,7 @@ static const char *p5_modes(unsigned int p5_mode)
* @reg_mutex: The lock for protecting among process accessing
* registers
* @p5_mode: PORT 5 mode status
+ * @ephy_node: External phy of_node.
*/
struct mt7530_priv {
struct device *dev;
@@ -472,6 +473,7 @@ struct mt7530_priv {
unsigned int id;
bool mcm;
unsigned int p5_mode;
+ struct device_node *ephy_node;
struct mt7530_port ports[MT7530_NUM_PORTS];
/* protect among processes for registers access*/
--
2.20.1
next prev parent reply other threads:[~2019-06-24 14:53 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 14:52 [PATCH RFC net-next 0/5] net: dsa: MT7530: Convert to PHYLINK and add support for port 5 René van Dorst
2019-06-24 14:52 ` [PATCH RFC net-next 1/5] net: dsa: mt7530: Convert to PHYLINK API René van Dorst
2019-06-24 15:39 ` Russell King - ARM Linux admin
2019-06-25 11:31 ` René van Dorst
2019-06-25 12:10 ` Russell King - ARM Linux admin
2019-06-25 18:37 ` Daniel Santos
2019-06-25 19:02 ` Andrew Lunn
2019-06-25 19:27 ` Daniel Santos
2019-06-25 20:41 ` Andrew Lunn
2019-06-25 21:07 ` René van Dorst
2019-06-25 21:21 ` Russell King - ARM Linux admin
2019-06-27 19:09 ` Daniel Santos
2019-06-27 19:28 ` Andrew Lunn
2019-06-28 7:16 ` Daniel Santos
2019-06-25 21:13 ` Russell King - ARM Linux admin
2019-06-25 20:24 ` Vladimir Oltean
2019-06-25 21:53 ` Russell King - ARM Linux admin
2019-06-25 22:14 ` Vladimir Oltean
2019-06-25 22:57 ` Russell King - ARM Linux admin
2019-06-25 23:10 ` Vladimir Oltean
2019-06-25 23:13 ` Vladimir Oltean
2019-06-26 1:52 ` Andrew Lunn
2019-06-26 7:41 ` Russell King - ARM Linux admin
2019-06-26 8:46 ` Vladimir Oltean
2019-06-26 9:04 ` Russell King - ARM Linux admin
2019-06-25 0:58 ` Daniel Santos
2019-06-25 11:43 ` René van Dorst
2019-06-24 14:52 ` [PATCH RFC net-next 2/5] dt-bindings: net: dsa: mt7530: Add support for port 5 René van Dorst
2019-06-24 14:52 ` [PATCH RFC net-next 3/5] " René van Dorst
2019-06-24 14:52 ` [PATCH RFC net-next 4/5] dt-bindings: net: dsa: mt7530: Add mediatek,ephy-handle to isolate ext. phy René van Dorst
2019-06-24 21:56 ` Florian Fainelli
2019-06-25 9:30 ` René van Dorst
2019-06-25 19:16 ` Florian Fainelli
2019-06-24 14:52 ` René van Dorst [this message]
2019-06-24 21:52 ` [PATCH RFC net-next 5/5] net: dsa: mt7530: Add mediatek,ephy-handle to isolate external phy Andrew Lunn
2019-06-25 0:22 ` Daniel Santos
2019-06-25 8:24 ` René van Dorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624145251.4849-6-opensource@vdorst.com \
--to=opensource@vdorst.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=frank-w@public-files.de \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=sean.wang@mediatek.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).