From: Ansuel Smith <ansuelsmth@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ansuel Smith <ansuelsmth@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH net-next v4 25/28] net: dsa: qca8k: add support for internal phy
Date: Sat, 8 May 2021 02:29:15 +0200 [thread overview]
Message-ID: <20210508002920.19945-25-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210508002920.19945-1-ansuelsmth@gmail.com>
Add support to setup_mdio_bus for internal phy declaration. Introduce a
flag to use the legacy port phy mapping by default and use the direct
mapping if a mdio node is detected in the switch node.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca8k.c | 46 +++++++++++++++++++++++++++--------------
drivers/net/dsa/qca8k.h | 1 +
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index f96579c0bd46..3d195fdd7ed5 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -663,19 +663,15 @@ qca8k_mdio_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
}
static int
-qca8k_mdio_write(struct qca8k_priv *priv, int port, u32 regnum, u16 data)
+qca8k_mdio_write(struct qca8k_priv *priv, int phy, u32 regnum, u16 data)
{
u16 r1, r2, page;
- u32 phy, val;
+ u32 val;
int ret;
if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
return -EINVAL;
- /* callee is responsible for not passing bad ports,
- * but we still would like to make spills impossible.
- */
- phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
QCA8K_MDIO_MASTER_REG_ADDR(regnum) |
@@ -705,19 +701,15 @@ qca8k_mdio_write(struct qca8k_priv *priv, int port, u32 regnum, u16 data)
}
static int
-qca8k_mdio_read(struct qca8k_priv *priv, int port, u32 regnum)
+qca8k_mdio_read(struct qca8k_priv *priv, int phy, u32 regnum)
{
u16 r1, r2, page;
- u32 phy, val;
+ u32 val;
int ret;
if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
return -EINVAL;
- /* callee is responsible for not passing bad ports,
- * but we still would like to make spills impossible.
- */
- phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
QCA8K_MDIO_MASTER_READ | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
QCA8K_MDIO_MASTER_REG_ADDR(regnum);
@@ -758,6 +750,13 @@ qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)
{
struct qca8k_priv *priv = ds->priv;
+ /* Check if the legacy mapping should be used and the
+ * port is not correctly mapped to the right PHY in the
+ * devicetree
+ */
+ if (priv->legacy_phy_port_mapping)
+ port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
+
return qca8k_mdio_write(priv, port, regnum, data);
}
@@ -767,6 +766,13 @@ qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)
struct qca8k_priv *priv = ds->priv;
int ret;
+ /* Check if the legacy mapping should be used and the
+ * port is not correctly mapped to the right PHY in the
+ * devicetree
+ */
+ if (priv->legacy_phy_port_mapping)
+ port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
+
ret = qca8k_mdio_read(priv, port, regnum);
if (ret < 0)
@@ -779,7 +785,7 @@ static int
qca8k_setup_mdio_bus(struct qca8k_priv *priv)
{
u32 internal_mdio_mask = 0, external_mdio_mask = 0, reg;
- struct device_node *ports, *port;
+ struct device_node *ports, *port, *mdio;
int err;
ports = of_get_child_by_name(priv->dev->of_node, "ports");
@@ -800,7 +806,8 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
if (!dsa_is_user_port(priv->ds, reg))
continue;
- if (of_property_read_bool(port, "phy-handle"))
+ if (of_property_read_bool(port, "phy-handle") &&
+ of_property_match_string(port, "phy-mode", "internal") < 0)
external_mdio_mask |= BIT(reg);
else
internal_mdio_mask |= BIT(reg);
@@ -837,6 +844,14 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
QCA8K_MDIO_MASTER_EN);
}
+ /* Check if the devicetree declare the port:phy mapping
+ * If a mapping can't be found the legacy mapping is used,
+ * using the qca8k_port_to_phy function
+ */
+ mdio = of_get_child_by_name(priv->dev->of_node, "mdio");
+ if (!mdio)
+ priv->legacy_phy_port_mapping = true;
+
priv->ops.phy_read = qca8k_phy_read;
priv->ops.phy_write = qca8k_phy_write;
return 0;
@@ -1198,7 +1213,8 @@ qca8k_phylink_validate(struct dsa_switch *ds, int port,
case 5:
/* Internal PHY */
if (state->interface != PHY_INTERFACE_MODE_NA &&
- state->interface != PHY_INTERFACE_MODE_GMII)
+ state->interface != PHY_INTERFACE_MODE_GMII &&
+ state->interface != PHY_INTERFACE_MODE_INTERNAL)
goto unsupported;
break;
case 6: /* 2nd CPU port / external PHY */
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index d365f85ab34f..ed3b05ad6745 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -255,6 +255,7 @@ struct qca8k_priv {
u8 switch_revision;
u8 rgmii_tx_delay;
u8 rgmii_rx_delay;
+ bool legacy_phy_port_mapping;
struct regmap *regmap;
struct mii_bus *bus;
struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS];
--
2.30.2
next prev parent reply other threads:[~2021-05-08 0:31 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-08 0:28 [RFC PATCH net-next v4 01/28] net: mdio: ipq8064: clean whitespaces in define Ansuel Smith
2021-05-08 0:28 ` [RFC PATCH net-next v4 02/28] net: mdio: ipq8064: add regmap config to disable REGCACHE Ansuel Smith
2021-05-08 15:46 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 03/28] net: mdio: ipq8064: enlarge sleep after read/write operation Ansuel Smith
2021-05-08 15:53 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 04/28] net: dsa: qca8k: change simple print to dev variant Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 05/28] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait Ansuel Smith
2021-05-08 17:38 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 06/28] net: dsa: qca8k: improve qca8k read/write/rmw bus access Ansuel Smith
2021-05-08 17:39 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 07/28] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-08 17:40 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 08/28] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-08 17:46 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 09/28] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-08 17:47 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 10/28] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-08 17:59 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 11/28] net: dsa: qca8k: handle error from qca8k_busy_wait Ansuel Smith
2021-05-08 17:59 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 12/28] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 13/28] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 14/28] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 15/28] net: dsa: qca8k: limit port5 delay to qca8337 Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 16/28] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 17/28] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-08 15:48 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 18/28] net: dsa: qca8k: add ethernet-ports fallback to setup_mdio_bus Ansuel Smith
2021-05-08 18:07 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 19/28] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-08 18:12 ` Andrew Lunn
2021-05-08 23:58 ` Ansuel Smith
2021-05-09 1:07 ` Andrew Lunn
2021-05-09 1:17 ` Ansuel Smith
2021-05-09 1:27 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 20/28] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 21/28] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 22/28] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 23/28] net: dsa: register of_mdiobus if a mdio node is declared Ansuel Smith
2021-05-08 4:36 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 24/28] devicetree: net: dsa: Document use of mdio node inside switch node Ansuel Smith
2021-05-10 14:01 ` Rob Herring
2021-05-08 0:29 ` Ansuel Smith [this message]
2021-05-08 0:29 ` [RFC PATCH net-next v4 26/28] net: dsa: permit driver to provide custom phy_mii_mask for slave mdiobus Ansuel Smith
2021-05-08 15:52 ` Florian Fainelli
2021-05-08 16:29 ` Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 27/28] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-08 15:49 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 28/28] net: phy: add qca8k driver for qca8k switch internal PHY Ansuel Smith
2021-05-08 4:35 ` DENG Qingfang
2021-05-08 11:30 ` Ansuel Smith
2021-05-08 15:45 ` Florian Fainelli
2021-05-08 15:45 ` [RFC PATCH net-next v4 01/28] net: mdio: ipq8064: clean whitespaces in define Florian Fainelli
2021-05-08 15:57 ` Joe Perches
2021-05-08 18:02 ` Andrew Lunn
2021-05-08 18:05 ` Ansuel Smith
2021-05-15 17:00 ` Jonathan McDowell
2021-05-15 17:03 ` Florian Fainelli
2021-05-15 17:30 ` Ansuel Smith
2021-05-15 18:08 ` Jonathan McDowell
2021-05-15 18:20 ` Ansuel Smith
2021-05-15 19:40 ` Jonathan McDowell
2021-05-15 19:47 ` Ansuel Smith
2021-05-15 23:52 ` Andrew Lunn
2021-05-16 0:23 ` Ansuel Smith
2021-05-16 9:37 ` Jonathan McDowell
2021-05-16 9:49 ` Jonathan McDowell
2021-05-16 10:12 ` Jonathan McDowell
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=20210508002920.19945-25-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.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).