Skip to contentSkip to conversation

Add MV88E6xxx DSA driver and use on gwventana

PATCH Superseded Tim Harvey 2 participants 14 messages Oct 4, 2022 – Oct 5, 2022

Subsystems (4)

v5 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

v5 cover Add MV88E6xxx DSA driver and use on gwventana

This series adds a DSA driver for the MV88E6xxx based on drivers/net/phy/mv88e61xx and uses it in the gwventana_gw5904_defconfig.

The hope is that the other three boards that use the MV88E61xx driver can move to this as well eventually so that we can remove the non-dm driver and the 4 Kconfig options it requires.

The MV88E6xxx has an MDIO interface thus DM_MDIO must be used so support for a UCLASS_MDIO driver is added to the fec_mxc ethernet driver in a way that allows a fallback to the previous non DM_MDIO case as there are many boards out there using this driver that define DM_MDIO but do not have the required dt props for a DM_MDIO driver which would cause a regression.

Additionally some other patches are here suggested by Vladimir:
- ensure MDIO children are scanned on post-bind is needed
- sanity check DSA driver required ops are present
- allow DSA drivers to not require xmit/recv functions
- remove unecessary xmit/recv functions from ksz9477 driver

v5:
- fix typo in defconfig update
- added support for MV88E6320
- added Fabio's rb tag
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device

v3:
- fix mdios node in dt
- add Vladimir's rb tag's

v2:
- added Ramon's rb tag's to first two patches
- add patches for dsa-uclass to sanity check ops and make xmit/recv optional
- fec: fix fallback for non conforming DM_MDIO dts
- mv88e61xx:
- rebase on v2022.07-rc2 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets

Tested on a Gateworks GW5904 which has a Marvell 88E6176 switch hanging off the IMX6 FEC.

Best Regards,

Tim

Tim Harvey (8):
net: mdio-uclass: scan for dm mdio children on post-bind
net: dsa: move cpu port probe to dsa_post_probe
net: dsa: ensure dsa driver has proper ops
net: dsa: allow rcv() and xmit() to be optional
net: ksz9477: remove unnecessary xmit and recv functions
net: fec: add support for DM_MDIO
net: add MV88E61xx DSA driver
board: gw_ventana: enable MV88E61XX DSA support

 arch/arm/dts/imx6qdl-gw5904.dtsi        |  31 +
 board/gateworks/gw_ventana/gw_ventana.c |  50 +-
 configs/gwventana_gw5904_defconfig      |   7 +-
 drivers/net/Kconfig                     |   7 +
 drivers/net/Makefile                    |   1 +
 drivers/net/fec_mxc.c                   |  90 ++-
 drivers/net/ksz9477.c                   |  23 -
 drivers/net/mv88e6xxx.c                 | 828 ++++++++++++++++++++++++
 net/dsa-uclass.c                        |  57 +-
 net/mdio-uclass.c                       |   4 +
 10 files changed, 1026 insertions(+), 72 deletions(-)
 create mode 100644 drivers/net/mv88e6xxx.c
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v5 1/8 net: mdio-uclass: scan for dm mdio children on post-bind

If a DM_MDIO driver is used we need to scan the subnodes as well.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- no changes
v2:
- added Ramon's rb tag

---
 net/mdio-uclass.c | 4 ++++
 1 file changed, 4 insertions(+)
net/mdio-uclass.c +4 -0
index 4401492ca015..d80037d0ac71 100644
@@ -49,7 +49,11 @@ static int dm_mdio_post_bind(struct udevice *dev)
 		return -EINVAL;
 	}
 
+#if CONFIG_IS_ENABLED(OF_REAL)
+	return dm_scan_fdt_dev(dev);
+#else
 	return 0;
+#endif
 }
 
 int dm_mdio_read(struct udevice *mdio_dev, int addr, int devad, int reg)
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH v5 2/8 net: dsa: move cpu port probe to dsa_post_probe

In reply to Tim Harvey

In order to ensure that a DSA driver probe gets called before dsa_ops->port_probe move the port_probe of the cpu_port to a post-probe function.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2:
- added Ramon's rb tag

---
 net/dsa-uclass.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
net/dsa-uclass.c +11 -2
index 5b7046432ff3..a37e76e25a8f 100644
@@ -466,7 +466,6 @@ static int dsa_pre_probe(struct udevice *dev)
 {
 	struct dsa_pdata *pdata = dev_get_uclass_plat(dev);
 	struct dsa_priv *priv = dev_get_uclass_priv(dev);
-	struct dsa_ops *ops = dsa_get_ops(dev);
 	int err;
 
 	priv->num_ports = pdata->num_ports;
@@ -482,6 +481,15 @@ static int dsa_pre_probe(struct udevice *dev)
 	if (err)
 		return err;
 
+	return 0;
+}
+
+static int dsa_post_probe(struct udevice *dev)
+{
+	struct dsa_priv *priv = dev_get_uclass_priv(dev);
+	struct dsa_ops *ops = dsa_get_ops(dev);
+	int err;
+
 	/* Simulate a probing event for the CPU port */
 	if (ops->port_probe) {
 		err = ops->port_probe(dev, priv->cpu_port,
@@ -491,13 +499,14 @@ static int dsa_pre_probe(struct udevice *dev)
 	}
 
 	return 0;
-}
+};
 
 UCLASS_DRIVER(dsa) = {
 	.id = UCLASS_DSA,
 	.name = "dsa",
 	.post_bind = dsa_post_bind,
 	.pre_probe = dsa_pre_probe,
+	.post_probe = dsa_post_probe,
 	.per_device_auto = sizeof(struct dsa_priv),
 	.per_device_plat_auto = sizeof(struct dsa_pdata),
 	.per_child_plat_auto = sizeof(struct dsa_port_pdata),
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH v5 2/8] net: dsa: move cpu port probe to dsa_post_probe

Quoted 15 lines · Tim Harvey
net/dsa-uclass.c +6 -0
index 5b7046432ff3..a37e76e25a8f 100644
@@ -466,7 +466,6 @@ static int dsa_pre_probe(struct udevice *dev)
+static int dsa_post_probe(struct udevice *dev)
+{
+	struct dsa_priv *priv = dev_get_uclass_priv(dev);
+	struct dsa_ops *ops = dsa_get_ops(dev);
+	int err;
+
 	/* Simulate a probing event for the CPU port */
 	if (ops->port_probe) {
 		err = ops->port_probe(dev, priv->cpu_port,

net/dsa-uclass.c static int dsa_pre_probe(struct udevice *dev) · line 502

Quoted 5 lines
net/dsa-uclass.c +1 -1
@@ -491,13 +499,14 @@ static int dsa_pre_probe(struct udevice *dev)
 	}
 
 	return 0;
-}
+};

Semicolons aren't needed at the end of functions.

author
#4 lore raw

PATCH v5 3/8 net: dsa: ensure dsa driver has proper ops

In reply to Tim Harvey

Add a function to sanity check a dsa driver having proper ops.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch

---
 net/dsa-uclass.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
net/dsa-uclass.c +17 -0
index a37e76e25a8f..e74dc178ff69 100644
@@ -342,6 +342,19 @@ U_BOOT_DRIVER(dsa_port) = {
 	.plat_auto = sizeof(struct eth_pdata),
 };
 
+static int dsa_sanitize_ops(struct udevice *dev)
+{
+	struct dsa_ops *ops = dsa_get_ops(dev);
+
+	if ((!ops->xmit || !ops->rcv) &&
+	    (!ops->port_enable && !ops->port_disable)) {
+		dev_err(dev, "Packets cannot be steered to ports\n");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 /*
  * This function mostly deals with pulling information out of the device tree
  * into the pdata structure.
@@ -358,6 +371,10 @@ static int dsa_post_bind(struct udevice *dev)
 	if (!ofnode_valid(node))
 		return -ENODEV;
 
+	err = dsa_sanitize_ops(dev);
+	if (err)
+		return err;
+
 	pdata->master_node = ofnode_null();
 
 	node = ofnode_find_subnode(node, "ports");
Signature · 1 line
2.25.1
author
#5 lore raw

PATCH v5 4/8 net: dsa: allow rcv() and xmit() to be optional

In reply to Tim Harvey

Allow rcv() and xmit() dsa driver ops to be optional in case a driver does not care to mangle a packet as in U-Boot only one network port is enabled at a time and thus no packet mangling is necessary.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch

---
 net/dsa-uclass.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
net/dsa-uclass.c +18 -9
index e74dc178ff69..37a84b88cd10 100644
@@ -131,16 +131,14 @@ static void dsa_port_stop(struct udevice *pdev)
  * We copy the frame to a stack buffer where we have reserved headroom and
  * tailroom space.  Headroom and tailroom are set to 0.
  */
-static int dsa_port_send(struct udevice *pdev, void *packet, int length)
+static int dsa_port_mangle_packet(struct udevice *pdev, void *packet, int length)
 {
+	struct dsa_port_pdata *port_pdata = dev_get_parent_plat(pdev);
 	struct udevice *dev = dev_get_parent(pdev);
 	struct dsa_priv *priv = dev_get_uclass_priv(dev);
 	int head = priv->headroom, tail = priv->tailroom;
-	struct udevice *master = dsa_get_master(dev);
 	struct dsa_ops *ops = dsa_get_ops(dev);
 	uchar dsa_packet_tmp[PKTSIZE_ALIGN];
-	struct dsa_port_pdata *port_pdata;
-	int err;
 
 	if (length + head + tail > PKTSIZE_ALIGN)
 		return -EINVAL;
@@ -152,10 +150,21 @@ static int dsa_port_send(struct udevice *pdev, void *packet, int length)
 	/* copy back to preserve original buffer alignment */
 	memcpy(packet, dsa_packet_tmp, length);
 
-	port_pdata = dev_get_parent_plat(pdev);
-	err = ops->xmit(dev, port_pdata->index, packet, length);
-	if (err)
-		return err;
+	return ops->xmit(dev, port_pdata->index, packet, length);
+}
+
+static int dsa_port_send(struct udevice *pdev, void *packet, int length)
+{
+	struct udevice *dev = dev_get_parent(pdev);
+	struct udevice *master = dsa_get_master(dev);
+	struct dsa_ops *ops = dsa_get_ops(dev);
+	int err;
+
+	if (ops->xmit) {
+		err = dsa_port_mangle_packet(pdev, packet, length);
+		if (err)
+			return err;
+	}
 
 	return eth_get_ops(master)->send(master, packet, length);
 }
@@ -172,7 +181,7 @@ static int dsa_port_recv(struct udevice *pdev, int flags, uchar **packetp)
 	int length, port_index, err;
 
 	length = eth_get_ops(master)->recv(master, flags, packetp);
-	if (length <= 0)
+	if (length <= 0 || !ops->rcv)
 		return length;
 
 	/*
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH v5 5/8 net: ksz9477: remove unnecessary xmit and recv functions

In reply to Tim Harvey

Remove the unnecessary xmit and recv functions.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch

---
 drivers/net/ksz9477.c | 23 -----------------------
 1 file changed, 23 deletions(-)
drivers/net/ksz9477.c +0 -23
index ed8f1895cb12..fb5c76c600be 100644
@@ -62,7 +62,6 @@
 
 struct ksz_dsa_priv {
 	struct udevice *dev;
-	int active_port;
 };
 
 static inline int ksz_read8(struct udevice *dev, u32 reg, u8 *val)
@@ -382,9 +381,6 @@ static int ksz_port_enable(struct udevice *dev, int port, struct phy_device *phy
 	data8 |= SW_START;
 	ksz_write8(priv->dev, REG_SW_OPERATION, data8);
 
-	/* keep track of current enabled non-cpu port */
-	priv->active_port = port;
-
 	return 0;
 }
 
@@ -413,28 +409,9 @@ static void ksz_port_disable(struct udevice *dev, int port, struct phy_device *p
 	 */
 }
 
-static int ksz_xmit(struct udevice *dev, int port, void *packet, int length)
-{
-	dev_dbg(dev, "%s P%d %d\n", __func__, port + 1, length);
-
-	return 0;
-}
-
-static int ksz_recv(struct udevice *dev, int *port, void *packet, int length)
-{
-	struct ksz_dsa_priv *priv = dev_get_priv(dev);
-
-	dev_dbg(dev, "%s P%d %d\n", __func__, priv->active_port + 1, length);
-	*port = priv->active_port;
-
-	return 0;
-};
-
 static const struct dsa_ops ksz_dsa_ops = {
 	.port_enable = ksz_port_enable,
 	.port_disable = ksz_port_disable,
-	.xmit = ksz_xmit,
-	.rcv = ksz_recv,
 };
 
 static int ksz_probe_mdio(struct udevice *dev)
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH v5 6/8 net: fec: add support for DM_MDIO

In reply to Tim Harvey

Add support for DM_MDIO by registering a UCLASS_MDIO driver and attempting to use it. This is necessary if wanting to use a DSA driver for example hanging off of the FEC MAC.

Care is taken to fallback to non DM_MDIO mii bus as several boards define DM_MDIO without having the proper device-tree configuration necessary such as an mdio subnode, a phy-mode prop, and either a valid phy-handle prop or fixed-phy subnode which will cause dm_eth_phy_connect() to fail.

---
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- no changes
v2:
- fix fallback mechanism for legacy dt's that do not have phy-handle and mdio subnode

---
 drivers/net/fec_mxc.c | 90 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 2 deletions(-)
drivers/net/fec_mxc.c +88 -2
index bbc4434ddb9e..7057472710fa 100644
@@ -30,6 +30,8 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <asm-generic/gpio.h>
+#include <dm/device_compat.h>
+#include <dm/lists.h>
 
 #include "fec_mxc.h"
 #include <eth_phy.h>
@@ -1026,6 +1028,81 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
 	return bus;
 }
 
+#ifdef CONFIG_DM_MDIO
+struct dm_fec_mdio_priv {
+	struct ethernet_regs *regs;
+};
+
+static int dm_fec_mdio_read(struct udevice *dev, int addr, int devad, int reg)
+{
+	struct dm_fec_mdio_priv *priv = dev_get_priv(dev);
+
+	return fec_mdio_read(priv->regs, addr, reg);
+}
+
+static int dm_fec_mdio_write(struct udevice *dev, int addr, int devad, int reg, u16 data)
+{
+	struct dm_fec_mdio_priv *priv = dev_get_priv(dev);
+
+	return fec_mdio_write(priv->regs, addr, reg, data);
+}
+
+static const struct mdio_ops dm_fec_mdio_ops = {
+	.read = dm_fec_mdio_read,
+	.write = dm_fec_mdio_write,
+};
+
+static int dm_fec_mdio_probe(struct udevice *dev)
+{
+	struct dm_fec_mdio_priv *priv = dev_get_priv(dev);
+
+	priv->regs = (struct ethernet_regs *)ofnode_get_addr(dev_ofnode(dev->parent));
+
+	return 0;
+}
+
+U_BOOT_DRIVER(fec_mdio) = {
+	.name		= "fec_mdio",
+	.id		= UCLASS_MDIO,
+	.probe		= dm_fec_mdio_probe,
+	.ops		= &dm_fec_mdio_ops,
+	.priv_auto	= sizeof(struct dm_fec_mdio_priv),
+};
+
+static int dm_fec_bind_mdio(struct udevice *dev)
+{
+	struct udevice *mdiodev;
+	const char *name;
+	ofnode mdio;
+	int ret = -ENODEV;
+
+	/* for a UCLASS_MDIO driver we need to bind and probe manually
+	 * for an internal MDIO bus that has no dt compatible of its own
+	 */
+	ofnode_for_each_subnode(mdio, dev_ofnode(dev)) {
+		name = ofnode_get_name(mdio);
+
+		if (strcmp(name, "mdio"))
+			continue;
+
+		ret = device_bind_driver_to_node(dev, "fec_mdio",
+						 name, mdio, &mdiodev);
+		if (ret) {
+			printf("%s bind %s failed: %d\n", __func__, name, ret);
+			break;
+		}
+
+		/* need to probe it as there is no compatible to do so */
+		ret = uclass_get_device_by_ofnode(UCLASS_MDIO, mdio, &mdiodev);
+		if (!ret)
+			return 0;
+		printf("%s probe %s failed: %d\n", __func__, name, ret);
+	}
+
+	return ret;
+}
+#endif
+
 static int fecmxc_read_rom_hwaddr(struct udevice *dev)
 {
 	struct fec_priv *priv = dev_get_priv(dev);
@@ -1089,7 +1166,7 @@ static int device_get_phy_addr(struct fec_priv *priv, struct udevice *dev)
 
 static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
 {
-	struct phy_device *phydev;
+	struct phy_device *phydev = NULL;
 	int addr;
 
 	addr = device_get_phy_addr(priv, dev);
@@ -1097,7 +1174,10 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
 	addr = CONFIG_FEC_MXC_PHYADDR;
 #endif
 
-	phydev = phy_connect(priv->bus, addr, dev, priv->interface);
+	if (IS_ENABLED(CONFIG_DM_MDIO))
+		phydev = dm_eth_phy_connect(dev);
+	if (!phydev)
+		phydev = phy_connect(priv->bus, addr, dev, priv->interface);
 	if (!phydev)
 		return -ENODEV;
 
@@ -1228,6 +1308,12 @@ static int fecmxc_probe(struct udevice *dev)
 
 	priv->dev_id = dev_seq(dev);
 
+	if (IS_ENABLED(CONFIG_DM_MDIO)) {
+		ret = dm_fec_bind_mdio(dev);
+		if (ret && ret != -ENODEV)
+			return ret;
+	}
+
 #ifdef CONFIG_DM_ETH_PHY
 	bus = eth_phy_get_mdio_bus(dev);
 #endif
Signature · 1 line
2.25.1
author
#8 lore raw

PATCH v5 7/8 net: add MV88E61xx DSA driver

In reply to Tim Harvey

Add a DSA driver for the MV88E61xx compatible GbE Ethernet switches.

---
v5:
- added support for MV88E6320
- added Fabio's rb tag
v4:
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device
v3:
- Added Vladimir's rb tag
v2:
- rebase on v2022.07-rc1 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions
into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets

---
 drivers/net/Kconfig     |   7 +
 drivers/net/Makefile    |   1 +
 drivers/net/mv88e6xxx.c | 833 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 841 insertions(+)
 create mode 100644 drivers/net/mv88e6xxx.c
drivers/net/Kconfig +7 -0
index 6bbbadc5eef3..5508dacbcc49 100644
@@ -438,6 +438,13 @@ config KSZ9477
 	  This driver implements a DSA switch driver for the KSZ9477 family
 	  of GbE switches using the I2C interface.
 
+config MV88E6XXX
+	bool "Marvell MV88E6xxx GbE switch DSA driver"
+	depends on DM_DSA && DM_MDIO
+	help
+	  This driver implements a DSA switch driver for the MV88E6xxx family
+	  of GbE switches using the MDIO interface
+
 config MVGBE
 	bool "Marvell Orion5x/Kirkwood network interface support"
 	depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +1 -0
index 96b7678e9882..f05fd58e3fa7 100644
@@ -59,6 +59,7 @@ obj-$(CONFIG_MEDIATEK_ETH) += mtk_eth.o
 obj-$(CONFIG_MPC8XX_FEC) += mpc8xx_fec.o
 obj-$(CONFIG_MT7620_ETH) += mt7620-eth.o
 obj-$(CONFIG_MT7628_ETH) += mt7628-eth.o
+obj-$(CONFIG_MV88E6XXX) += mv88e6xxx.o
 obj-$(CONFIG_MVGBE) += mvgbe.o
 obj-$(CONFIG_MVMDIO) += mvmdio.o
 obj-$(CONFIG_MVNETA) += mvneta.o
drivers/net/mv88e6xxx.c new file +833 -0

833 lines not on this page · raw message

Signature · 1 line
2.25.1
#9 lore raw

Re: [PATCH v5 7/8] net: add MV88E61xx DSA driver

Please also rewrite "61xx" from the commit message into "6xxx".

Quoted 45 lines · Tim Harvey

Add a DSA driver for the MV88E61xx compatible GbE Ethernet switches.

---
v5:
- added support for MV88E6320
- added Fabio's rb tag
v4:
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device
v3:
- Added Vladimir's rb tag
v2:
- rebase on v2022.07-rc1 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions
into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets

---
 drivers/net/Kconfig     |   7 +
 drivers/net/Makefile    |   1 +
 drivers/net/mv88e6xxx.c | 833 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 841 insertions(+)
 create mode 100644 drivers/net/mv88e6xxx.c
drivers/net/Kconfig +0 -0
index 6bbbadc5eef3..5508dacbcc49 100644

drivers/net/Kconfig config KSZ9477 · line 446

Quoted 9 lines
drivers/net/Kconfig +6 -0
@@ -438,6 +438,13 @@ config KSZ9477
 	  This driver implements a DSA switch driver for the KSZ9477 family
 	  of GbE switches using the I2C interface.
 
+config MV88E6XXX
+	bool "Marvell MV88E6xxx GbE switch DSA driver"
+	depends on DM_DSA && DM_MDIO
+	help
+	  This driver implements a DSA switch driver for the MV88E6xxx family
+	  of GbE switches using the MDIO interface

I don't think they are all gigabit.

Quoted 44 lines
drivers/net/Kconfig +1 -0
+
 config MVGBE
 	bool "Marvell Orion5x/Kirkwood network interface support"
 	depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +1 -0
index 96b7678e9882..f05fd58e3fa7 100644
@@ -59,6 +59,7 @@ obj-$(CONFIG_MEDIATEK_ETH) += mtk_eth.o
 obj-$(CONFIG_MPC8XX_FEC) += mpc8xx_fec.o
 obj-$(CONFIG_MT7620_ETH) += mt7620-eth.o
 obj-$(CONFIG_MT7628_ETH) += mt7628-eth.o
+obj-$(CONFIG_MV88E6XXX) += mv88e6xxx.o
 obj-$(CONFIG_MVGBE) += mvgbe.o
 obj-$(CONFIG_MVMDIO) += mvmdio.o
 obj-$(CONFIG_MVNETA) += mvneta.o
drivers/net/mv88e6xxx.c new file +23 -0
new file mode 100644
index 000000000000..e59e2464c641
+static int mv88e6xxx_switch_reset(struct udevice *dev)
+{
+	struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+	int time;
+	int val;
+	u8 port;
+
+	/* Disable all ports */
+	for (port = 0; port < priv->port_count; port++) {
+		val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+		if (val < 0)
+			return val;
+		val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+				       PORT_REG_CTRL_PSTATE_WIDTH,
+				       PORT_REG_CTRL_PSTATE_DISABLED);
+		val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+		if (val < 0)
+			return val;
+	}
+
+	/* Wait 2 ms for queues to drain */
+	udelay(2000);
+

drivers/net/mv88e6xxx.c line 474

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+	/* Reset switch */
+	val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_CTRL);
+	if (val < 0)
+		return val;
+	val |= GLOBAL1_CTRL_SWRESET;
+	val = mv88e6xxx_reg_write(dev, priv->global1, GLOBAL1_CTRL, val);
+	if (val < 0)
+		return val;
+
+	/* Wait up to 1 second for switch reset complete */

for switch reset *to* complete

drivers/net/mv88e6xxx.c line 475

Quoted 1 line
drivers/net/mv88e6xxx.c new file +1 -0
+	for (time = 1000; time; time--) {

Maybe "time_ms"? Or "retries"?

Quoted 45 lines
drivers/net/mv88e6xxx.c new file +45 -0
+		val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_CTRL);
+		if (val >= 0 && ((val & GLOBAL1_CTRL_SWRESET) == 0))
+			break;
+		udelay(1000);
+	}
+	if (!time)
+		return -ETIMEDOUT;
+
+	return 0;
+}
+
+static int mv88e6xxx_serdes_init(struct udevice *dev)
+{
+	int val;
+
+	val = mv88e6xxx_set_page(dev, DEVADDR_SERDES, PHY_PAGE_SERDES);
+	if (val < 0)
+		return val;
+
+	/* Power up serdes module */
+	val = mv88e6xxx_phy_read(dev, DEVADDR_SERDES, MII_BMCR);
+	if (val < 0)
+		return val;
+	val &= ~(BMCR_PDOWN);
+	val = mv88e6xxx_phy_write(dev, DEVADDR_SERDES, MII_BMCR, val);
+	if (val < 0)
+		return val;
+
+	return 0;
+}
+
+static int mv88e6xxx_fixed_port_setup(struct udevice *dev, u8 port)
+{
+	struct dsa_pdata *dsa_pdata = dev_get_uclass_plat(dev);
+	struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+	int val;
+
+	val = mv88e6xxx_port_read(dev, port, PORT_REG_PHYS_CTRL);
+	if (val < 0)
+		return val;
+
+	val &= ~(PORT_REG_PHYS_CTRL_SPD_MASK |
+		 PORT_REG_PHYS_CTRL_FC_VALUE |
+		 PORT_REG_PHYS_CTRL_FC_FORCE);
+	val |= PORT_REG_PHYS_CTRL_FC_FORCE |

drivers/net/mv88e6xxx.c line 530

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+	       PORT_REG_PHYS_CTRL_DUPLEX_VALUE |
+	       PORT_REG_PHYS_CTRL_DUPLEX_FORCE;
+
+	if (priv->id == PORT_SWITCH_ID_6071) {
+		val |= PORT_REG_PHYS_CTRL_SPD100;
+	} else {
+		val |= PORT_REG_PHYS_CTRL_PCS_AN_EN |
+		       PORT_REG_PHYS_CTRL_PCS_AN_RST |
+		       PORT_REG_PHYS_CTRL_SPD1000;
+	}

The speed and duplex are available in struct phy_device which is passed to mv88e6xxx_port_enable() for all ports, so why hack them?

Quoted 52 lines
drivers/net/mv88e6xxx.c new file +52 -0
+
+	if (port == dsa_pdata->cpu_port)
+		val |= PORT_REG_PHYS_CTRL_LINK_VALUE |
+		       PORT_REG_PHYS_CTRL_LINK_FORCE;
+
+	return mv88e6xxx_port_write(dev, port, PORT_REG_PHYS_CTRL, val);
+}
+
+/*
+ * This function is used to pre-configure the required register
+ * offsets, so that the indirect register access to the PHY registers
+ * is possible. This is necessary to be able to read the PHY ID
+ * while driver probing or in get_phy_id(). The globalN register
+ * offsets must be initialized correctly for a detected switch,
+ * otherwise detection of the PHY ID won't work!
+ */
+static int mv88e6xxx_priv_reg_offs_pre_init(struct udevice *dev)
+{
+	struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+
+	/*
+	 * Initial 'port_reg_base' value must be an offset of existing
+	 * port register, then reading the ID should succeed. First, try
+	 * to read via port registers with device address 0x10 (88E6096
+	 * and compatible switches).
+	 */
+	priv->port_reg_base = 0x10;
+	priv->id = mv88e6xxx_get_switch_id(dev);
+	if (priv->id != 0xfff0) {
+		priv->global1 = 0x1B;
+		priv->global2 = 0x1C;
+		return 0;
+	}
+
+	/*
+	 * Now try via port registers with device address 0x08
+	 * (88E6020 and compatible switches).
+	 */
+	priv->port_reg_base = 0x08;
+	priv->id = mv88e6xxx_get_switch_id(dev);
+	if (priv->id != 0xfff0) {
+		priv->global1 = 0x0F;
+		priv->global2 = 0x07;
+		return 0;
+	}
+
+	dev_warn(dev, "%s Unknown ID 0x%x\n", __func__, priv->id);
+
+	return -ENODEV;
+}
+
+static int mv88e6xxx_mdio_read(struct udevice *dev, int addr, int devad, int reg)

drivers/net/mv88e6xxx.c line 592

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+{
+	return mv88e6xxx_phy_read_indirect(dev->parent, DEVADDR_PHY(addr),
+					   MDIO_DEVAD_NONE, reg);
+}
+
+static int mv88e6xxx_mdio_write(struct udevice *dev, int addr, int devad,
+				int reg, u16 val)
+{
+	return mv88e6xxx_phy_write_indirect(dev->parent, DEVADDR_PHY(addr),
+					   MDIO_DEVAD_NONE, reg, val);

Please align MDIO_DEVAD_NONE to the open bracket.

Quoted 14 lines
drivers/net/mv88e6xxx.c new file +14 -0
+}
+
+static const struct mdio_ops mv88e6xxx_mdio_ops = {
+	.read = mv88e6xxx_mdio_read,
+	.write = mv88e6xxx_mdio_write,
+};
+
+static int mv88e6xxx_mdio_bind(struct udevice *dev)
+{
+	char name[32];
+	static int num_devices;
+
+	sprintf(name, "mv88e6xxx-mdio-%d", num_devices++);
+	device_set_name(dev, name);

drivers/net/mv88e6xxx.c line 616

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+
+	return 0;
+}
+
+U_BOOT_DRIVER(mv88e6xxx_mdio) = {
+	.name		= "mv88e6xxx_mdio",
+	.id		= UCLASS_MDIO,
+	.ops		= &mv88e6xxx_mdio_ops,
+	.bind		= mv88e6xxx_mdio_bind,
+	.priv_auto	= sizeof(struct mv88e6xxx_priv),

You are not using dev_get_priv(dev) with dev == the MDIO controller udevice. You are always calling phy_read|write_indirect with dev->parent, and calling dev_get_priv() on that. So you are allocating private data for nothing.

Quoted 6 lines
drivers/net/mv88e6xxx.c new file +6 -0
+	.plat_auto	= sizeof(struct mdio_perdev_priv),
+};
+
+static int mv88e6xxx_port_enable(struct udevice *dev, int port, struct phy_device *phy)
+{
+	struct dsa_pdata *dsa_pdata = dev_get_uclass_plat(dev);

drivers/net/mv88e6xxx.c line 632

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+	struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+	int val, ret;
+
+	dev_dbg(dev, "%s P%d phy:0x%08x %s\n", __func__, port,
+		phy->phy_id, phy_string_for_interface(phy->interface));
+
+	/*
+	 * Enable energy-detect sensing on PHY, used to determine when a PHY
+	 * port is physically connected
+	 */

What if it's not a PHY port?

Quoted 24 lines
drivers/net/mv88e6xxx.c new file +24 -0
+	val = mv88e6xxx_phy_read(dev, port, PHY_REG_CTRL1);
+	if (val < 0)
+		return val;
+	val = bitfield_replace(val, priv->phy_ctrl1_en_det_shift,
+			       priv->phy_ctrl1_en_det_width,
+			       priv->phy_ctrl1_en_det_ctrl);
+	val = mv88e6xxx_phy_write(dev, port, PHY_REG_CTRL1, val);
+	if (val < 0)
+		return val;
+
+	/* enable port */
+	val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+	if (val < 0)
+		return val;
+	val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+			       PORT_REG_CTRL_PSTATE_WIDTH,
+			       PORT_REG_CTRL_PSTATE_FORWARD);
+	val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+	if (val < 0)
+		return val;
+
+	/* configure RGMII delays for fixed link */
+	if (phy->phy_id == PHY_FIXED_ID) {
+		/* Physical Control register: Table 62 */

drivers/net/mv88e6xxx.c line 666

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+		val = mv88e6xxx_port_read(dev, port, PORT_REG_PHYS_CTRL);
+		val &= ~(PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK ||
+			 PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK);
+		if (phy->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+		    phy->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+			val |= PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK;
+		if (phy->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+		    phy->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+			val |= PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK;
+		val |= BIT(5) | BIT(4); /* Force link */

The 5 and the 4 are PORT_REG_PHYS_CTRL_LINK_VALUE | PORT_REG_PHYS_CTRL_LINK_FORCE, right? This makes either this or this assignment from mv88e6xxx_fixed_port_setup() redundant:

	if (port == dsa_pdata->cpu_port)
		val |= PORT_REG_PHYS_CTRL_LINK_VALUE |
		       PORT_REG_PHYS_CTRL_LINK_FORCE;

I'd prefer you keep the macros as opposed to the magic values, but force the link unconditionally for all fixed ports, rather than just for the CPU port. There might come support for cascaded DSA ports in the future, and this entire shebang will need to be patched otherwise.

drivers/net/mv88e6xxx.c line 669

Quoted 3 lines
drivers/net/mv88e6xxx.c new file +3 -0
+		ret = mv88e6xxx_port_write(dev, port, PORT_REG_PHYS_CTRL, val);
+		if (ret < 0)
+			return ret;

All of this logic from the "if" branch can be moved into mv88e6xxx_fixed_port_setup().

Quoted 6 lines
drivers/net/mv88e6xxx.c new file +6 -0
+
+		ret = mv88e6xxx_fixed_port_setup(dev, port);
+		if (ret < 0)
+			return ret;
+	}
+

drivers/net/mv88e6xxx.c line 685

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+	if (port == dsa_pdata->cpu_port) {
+		/* Set CPUDest for cpu port */
+		val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_MON_CTRL);
+		if (val < 0)
+			return val;
+		val = bitfield_replace(val, GLOBAL1_MON_CTRL_CPUDEST_SHIFT,
+				       GLOBAL1_MON_CTRL_CPUDEST_WIDTH, port);
+		val = mv88e6xxx_reg_write(dev, priv->global1, GLOBAL1_MON_CTRL, val);
+		if (val < 0)
+			return val;

Since you don't use DSA/EDSA tags and you are quite averse to them, I don't think you need to set the CPUDest.

drivers/net/mv88e6xxx.c line 698

Quoted 13 lines
drivers/net/mv88e6xxx.c new file +13 -0
+
+		if (mv88e6xxx_6352_family(dev)) {
+			/* initialize serdes */
+			val = mv88e6xxx_get_cmode(dev, dsa_pdata->cpu_port);
+			if (val < 0)
+				return val;
+			if (val == PORT_REG_STATUS_CMODE_100BASE_X ||
+			    val == PORT_REG_STATUS_CMODE_1000BASE_X ||
+			    val == PORT_REG_STATUS_CMODE_SGMII) {
+				val = mv88e6xxx_serdes_init(dev);
+				if (val < 0)
+					return val;
+			}

You can/should initialize the SERDES regardless of whether this is the CPU port or not, if the C_MODE dictates so. Otherwise said, the "if (port == dsa_pdata->cpu_port)" check should disappear.

Additionally, you should validate that phy->interface matches what the C_MODE reports for this port (I understand that changing the C_MODE is possible but not exactly without its issues), and report an error on mismatch, to avoid people scratching their heads.

Quoted 11 lines
drivers/net/mv88e6xxx.c new file +11 -0
+		}
+	}
+
+	return 0;
+}
+
+static void mv88e6xxx_port_disable(struct udevice *dev, int port, struct phy_device *phy)
+{
+	int val;
+
+	dev_dbg(dev, "%s P%d phy:0x%x\n", __func__, port, phy->phy_id);

drivers/net/mv88e6xxx.c line 719

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+
+	val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+	if (val < 0)
+		return;
+	val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+			       PORT_REG_CTRL_PSTATE_WIDTH,
+			       PORT_REG_CTRL_PSTATE_DISABLED);
+	val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+	if (val < 0)
+		return;

The assignment of "val" and then its checking is quite useless here, either print an error or remove it.

Quoted 9 lines
drivers/net/mv88e6xxx.c new file +9 -0
+}
+
+static const struct dsa_ops mv88e6xxx_dsa_ops = {
+	.port_enable = mv88e6xxx_port_enable,
+	.port_disable = mv88e6xxx_port_disable,
+};
+
+/* bind and probe the switch mdios */
+static int mv88e6xxx_probe_mdio(struct udevice *dev)

drivers/net/mv88e6xxx.c line 738

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+{
+	struct udevice *mdev;
+	ofnode node, mdios;
+	const char *name;
+	int ret;
+
+	/* bind phy ports of mdios child node to mv88e6xxx_mdio device */
+	mdios = dev_read_subnode(dev, "mdios");
+	if (!ofnode_valid(mdios))
+		return 0;

I wrote a long, angry comment about the parsing of this "mdios" container node. Please squash the fixup from patch 8/8 into the code here, I just wasted 10 minutes which I'm not getting back.

Quoted 20 lines
drivers/net/mv88e6xxx.c new file +20 -0
+
+	ofnode_for_each_subnode(node, mdios) {
+		name = ofnode_get_name(node);
+		ret = device_bind_driver_to_node(dev,
+						 "mv88e6xxx_mdio",
+						 name, node, NULL);
+		if (ret) {
+			dev_err(dev, "failed to bind %s: %d\n", name, ret);
+			continue;
+		}
+
+		/* need to probe it as there is no compatible to do so */
+		ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev);
+		if (ret) {
+			dev_err(dev, "failed to probe %s: %d\n", name, ret);
+			continue;
+		}
+	}
+
+	return ret;

drivers/net/mv88e6xxx.c line 768

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+}
+
+static int mv88e6xxx_probe(struct udevice *dev)
+{
+	struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+	struct udevice *master = dsa_get_master(dev);
+	int ret;
+
+	if (!master)
+		return -ENODEV;

Remove this.

You could consider treating the 'status = "disabled";' case, however. Look at sja1105_probe() for example.

drivers/net/mv88e6xxx.c line 770

Quoted 2 lines
drivers/net/mv88e6xxx.c new file +2 -0
+
+	dev_dbg(dev, "%s master:%s\n", __func__, master->name);

Useless variable, please remove it and stop looking at it in probe().

Quoted 36 lines
drivers/net/mv88e6xxx.c new file +36 -0
+
+	/* probe internal mdio bus */
+	ret = mv88e6xxx_probe_mdio(dev);
+	if (ret)
+		return ret;
+
+	ret = mv88e6xxx_priv_reg_offs_pre_init(dev);
+	if (ret)
+		return ret;
+
+	dev_dbg(dev, "ID=0x%x PORT_BASE=0x%02x GLOBAL1=0x%02x GLOBAL2=0x%02x\n",
+		priv->id, priv->port_reg_base, priv->global1, priv->global2);
+	switch (priv->id) {
+	case PORT_SWITCH_ID_6096:
+	case PORT_SWITCH_ID_6097:
+	case PORT_SWITCH_ID_6172:
+	case PORT_SWITCH_ID_6176:
+	case PORT_SWITCH_ID_6240:
+	case PORT_SWITCH_ID_6352:
+		priv->port_count = 11;
+		priv->phy_ctrl1_en_det_shift = 8;
+		priv->phy_ctrl1_en_det_width = 2;
+		priv->phy_ctrl1_en_det_ctrl =
+			PHY_REG_CTRL1_ENERGY_DET_SENSE_XMIT;
+		break;
+	case PORT_SWITCH_ID_6020:
+	case PORT_SWITCH_ID_6070:
+	case PORT_SWITCH_ID_6071:
+	case PORT_SWITCH_ID_6220:
+	case PORT_SWITCH_ID_6250:
+	case PORT_SWITCH_ID_6320:
+		priv->port_count = 7;
+		priv->phy_ctrl1_en_det_shift = 14;
+		priv->phy_ctrl1_en_det_width = 1;
+		priv->phy_ctrl1_en_det_ctrl =
+			PHY_REG_CTRL1_ENERGY_DET_SENSE_PULSE;

drivers/net/mv88e6xxx.c line 816

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+		break;
+	default:
+		return -ENODEV;
+	}
+
+	ret = mv88e6xxx_switch_reset(dev);
+	if (ret < 0)
+		return ret;
+
+	dsa_set_tagging(dev, 0, 0);

Just don't call this, it doesn't do anything.

Quoted 20 lines
drivers/net/mv88e6xxx.c new file +17 -0
+
+	return 0;
+}
+
+static const struct udevice_id mv88e6xxx_ids[] = {
+	{ .compatible = "marvell,mv88e6085" },
+	{ }
+};
+
+U_BOOT_DRIVER(mv88e6xxx) = {
+	.name		= "mv88e6xxx",
+	.id		= UCLASS_DSA,
+	.of_match	= mv88e6xxx_ids,
+	.probe		= mv88e6xxx_probe,
+	.ops		= &mv88e6xxx_dsa_ops,
+	.priv_auto	= sizeof(struct mv88e6xxx_priv),
+};
Signature · 1 line
2.25.1
author
#10 lore raw

Re: [PATCH v5 7/8] net: add MV88E61xx DSA driver

Quoted 118 lines · Vladimir Oltean

Please also rewrite "61xx" from the commit message into "6xxx".

Quoted 45 lines · Tim Harvey

Add a DSA driver for the MV88E61xx compatible GbE Ethernet switches.

---
v5:
- added support for MV88E6320
- added Fabio's rb tag
v4:
- rename to mv88e6xxx
- sort includes alphabetically
- remove dsa term from function names
- reduce indentation level and remove unecessary code in of probe_mdio function
- rename pdev to mdev to represent mdio device
v3:
- Added Vladimir's rb tag
v2:
- rebase on v2022.07-rc1 (use ofnode_get_phy_node)
- remove unused commented out fields from struct
- remove unused PORT_MASK macro
- remove phy from priv struct name
- refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions
into mv88e61xx_dsa_port_enable
- remove unecessary skiping of disabling of CPU port
- remove unecessary dev_set_parent_priv
- remove unnecessary static init flag
- replace debug with a dev_warn if switch device-id unsupported
- remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets

---
 drivers/net/Kconfig     |   7 +
 drivers/net/Makefile    |   1 +
 drivers/net/mv88e6xxx.c | 833 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 841 insertions(+)
 create mode 100644 drivers/net/mv88e6xxx.c
drivers/net/Kconfig +0 -0
index 6bbbadc5eef3..5508dacbcc49 100644

drivers/net/Kconfig config KSZ9477 · line 446

Quoted 9 lines
drivers/net/Kconfig +6 -0
@@ -438,6 +438,13 @@ config KSZ9477
        This driver implements a DSA switch driver for the KSZ9477 family
        of GbE switches using the I2C interface.
 
+config MV88E6XXX
+     bool "Marvell MV88E6xxx GbE switch DSA driver"
+     depends on DM_DSA && DM_MDIO
+     help
+       This driver implements a DSA switch driver for the MV88E6xxx family
+       of GbE switches using the MDIO interface

I don't think they are all gigabit.

Quoted 44 lines
drivers/net/Kconfig +1 -0
+
 config MVGBE
      bool "Marvell Orion5x/Kirkwood network interface support"
      depends on ARCH_KIRKWOOD || ARCH_ORION5X
drivers/net/Makefile +1 -0
index 96b7678e9882..f05fd58e3fa7 100644
@@ -59,6 +59,7 @@ obj-$(CONFIG_MEDIATEK_ETH) += mtk_eth.o
 obj-$(CONFIG_MPC8XX_FEC) += mpc8xx_fec.o
 obj-$(CONFIG_MT7620_ETH) += mt7620-eth.o
 obj-$(CONFIG_MT7628_ETH) += mt7628-eth.o
+obj-$(CONFIG_MV88E6XXX) += mv88e6xxx.o
 obj-$(CONFIG_MVGBE) += mvgbe.o
 obj-$(CONFIG_MVMDIO) += mvmdio.o
 obj-$(CONFIG_MVNETA) += mvneta.o
drivers/net/mv88e6xxx.c new file +23 -0
new file mode 100644
index 000000000000..e59e2464c641
+static int mv88e6xxx_switch_reset(struct udevice *dev)
+{
+     struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+     int time;
+     int val;
+     u8 port;
+
+     /* Disable all ports */
+     for (port = 0; port < priv->port_count; port++) {
+             val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+             if (val < 0)
+                     return val;
+             val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+                                    PORT_REG_CTRL_PSTATE_WIDTH,
+                                    PORT_REG_CTRL_PSTATE_DISABLED);
+             val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+             if (val < 0)
+                     return val;
+     }
+
+     /* Wait 2 ms for queues to drain */
+     udelay(2000);
+

drivers/net/mv88e6xxx.c line 474

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+     /* Reset switch */
+     val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_CTRL);
+     if (val < 0)
+             return val;
+     val |= GLOBAL1_CTRL_SWRESET;
+     val = mv88e6xxx_reg_write(dev, priv->global1, GLOBAL1_CTRL, val);
+     if (val < 0)
+             return val;
+
+     /* Wait up to 1 second for switch reset complete */

for switch reset *to* complete

Quoted 3 lines
Quoted 1 line

+ for (time = 1000; time; time--) {

Maybe "time_ms"? Or "retries"?

ok - I will clean up this code taken from original driver

Quoted 51 lines
Quoted 51 lines
drivers/net/mv88e6xxx.c new file +50 -0
+             val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_CTRL);
+             if (val >= 0 && ((val & GLOBAL1_CTRL_SWRESET) == 0))
+                     break;
+             udelay(1000);
+     }
+     if (!time)
+             return -ETIMEDOUT;
+
+     return 0;
+}
+
+static int mv88e6xxx_serdes_init(struct udevice *dev)
+{
+     int val;
+
+     val = mv88e6xxx_set_page(dev, DEVADDR_SERDES, PHY_PAGE_SERDES);
+     if (val < 0)
+             return val;
+
+     /* Power up serdes module */
+     val = mv88e6xxx_phy_read(dev, DEVADDR_SERDES, MII_BMCR);
+     if (val < 0)
+             return val;
+     val &= ~(BMCR_PDOWN);
+     val = mv88e6xxx_phy_write(dev, DEVADDR_SERDES, MII_BMCR, val);
+     if (val < 0)
+             return val;
+
+     return 0;
+}
+
+static int mv88e6xxx_fixed_port_setup(struct udevice *dev, u8 port)
+{
+     struct dsa_pdata *dsa_pdata = dev_get_uclass_plat(dev);
+     struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+     int val;
+
+     val = mv88e6xxx_port_read(dev, port, PORT_REG_PHYS_CTRL);
+     if (val < 0)
+             return val;
+
+     val &= ~(PORT_REG_PHYS_CTRL_SPD_MASK |
+              PORT_REG_PHYS_CTRL_FC_VALUE |
+              PORT_REG_PHYS_CTRL_FC_FORCE);
+     val |= PORT_REG_PHYS_CTRL_FC_FORCE |
+            PORT_REG_PHYS_CTRL_DUPLEX_VALUE |
+            PORT_REG_PHYS_CTRL_DUPLEX_FORCE;
+
+     if (priv->id == PORT_SWITCH_ID_6071) {
+             val |= PORT_REG_PHYS_CTRL_SPD100;
Quoted 8 lines

drivers/net/mv88e6xxx.c line 530

Quoted 5 lines
drivers/net/mv88e6xxx.c new file +5 -0
+     } else {
+             val |= PORT_REG_PHYS_CTRL_PCS_AN_EN |
+                    PORT_REG_PHYS_CTRL_PCS_AN_RST |
+                    PORT_REG_PHYS_CTRL_SPD1000;
+     }

The speed and duplex are available in struct phy_device which is passed to mv88e6xxx_port_enable() for all ports, so why hack them?

I think it likely makes sense to just remove mv88e6xxx_fixed_port_setup taken from the original driver due to the redundancy you point out later.

For fixed ports, I would expect phy->speed and phy->duplex to be set for fixed ports when port_enable is called but I find speed=0 and duplex=-1 instead. Do you know why these are not getting passed in per the fixed config in dt?

Maybe I should be ignoring speed/duplex/flow-control and just leaving the register alone as it defaults to auto-negotiate?

Quoted 163 lines
Quoted 53 lines
drivers/net/mv88e6xxx.c new file +52 -0
+
+     if (port == dsa_pdata->cpu_port)
+             val |= PORT_REG_PHYS_CTRL_LINK_VALUE |
+                    PORT_REG_PHYS_CTRL_LINK_FORCE;
+
+     return mv88e6xxx_port_write(dev, port, PORT_REG_PHYS_CTRL, val);
+}
+
+/*
+ * This function is used to pre-configure the required register
+ * offsets, so that the indirect register access to the PHY registers
+ * is possible. This is necessary to be able to read the PHY ID
+ * while driver probing or in get_phy_id(). The globalN register
+ * offsets must be initialized correctly for a detected switch,
+ * otherwise detection of the PHY ID won't work!
+ */
+static int mv88e6xxx_priv_reg_offs_pre_init(struct udevice *dev)
+{
+     struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+
+     /*
+      * Initial 'port_reg_base' value must be an offset of existing
+      * port register, then reading the ID should succeed. First, try
+      * to read via port registers with device address 0x10 (88E6096
+      * and compatible switches).
+      */
+     priv->port_reg_base = 0x10;
+     priv->id = mv88e6xxx_get_switch_id(dev);
+     if (priv->id != 0xfff0) {
+             priv->global1 = 0x1B;
+             priv->global2 = 0x1C;
+             return 0;
+     }
+
+     /*
+      * Now try via port registers with device address 0x08
+      * (88E6020 and compatible switches).
+      */
+     priv->port_reg_base = 0x08;
+     priv->id = mv88e6xxx_get_switch_id(dev);
+     if (priv->id != 0xfff0) {
+             priv->global1 = 0x0F;
+             priv->global2 = 0x07;
+             return 0;
+     }
+
+     dev_warn(dev, "%s Unknown ID 0x%x\n", __func__, priv->id);
+
+     return -ENODEV;
+}
+
+static int mv88e6xxx_mdio_read(struct udevice *dev, int addr, int devad, int reg)

drivers/net/mv88e6xxx.c line 592

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+{
+     return mv88e6xxx_phy_read_indirect(dev->parent, DEVADDR_PHY(addr),
+                                        MDIO_DEVAD_NONE, reg);
+}
+
+static int mv88e6xxx_mdio_write(struct udevice *dev, int addr, int devad,
+                             int reg, u16 val)
+{
+     return mv88e6xxx_phy_write_indirect(dev->parent, DEVADDR_PHY(addr),
+                                        MDIO_DEVAD_NONE, reg, val);

Please align MDIO_DEVAD_NONE to the open bracket.

Quoted 14 lines
drivers/net/mv88e6xxx.c new file +14 -0
+}
+
+static const struct mdio_ops mv88e6xxx_mdio_ops = {
+     .read = mv88e6xxx_mdio_read,
+     .write = mv88e6xxx_mdio_write,
+};
+
+static int mv88e6xxx_mdio_bind(struct udevice *dev)
+{
+     char name[32];
+     static int num_devices;
+
+     sprintf(name, "mv88e6xxx-mdio-%d", num_devices++);
+     device_set_name(dev, name);

drivers/net/mv88e6xxx.c line 616

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+
+     return 0;
+}
+
+U_BOOT_DRIVER(mv88e6xxx_mdio) = {
+     .name           = "mv88e6xxx_mdio",
+     .id             = UCLASS_MDIO,
+     .ops            = &mv88e6xxx_mdio_ops,
+     .bind           = mv88e6xxx_mdio_bind,
+     .priv_auto      = sizeof(struct mv88e6xxx_priv),

You are not using dev_get_priv(dev) with dev == the MDIO controller udevice. You are always calling phy_read|write_indirect with dev->parent, and calling dev_get_priv() on that. So you are allocating private data for nothing.

Quoted 6 lines
drivers/net/mv88e6xxx.c new file +6 -0
+     .plat_auto      = sizeof(struct mdio_perdev_priv),
+};
+
+static int mv88e6xxx_port_enable(struct udevice *dev, int port, struct phy_device *phy)
+{
+     struct dsa_pdata *dsa_pdata = dev_get_uclass_plat(dev);

drivers/net/mv88e6xxx.c line 632

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+     struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+     int val, ret;
+
+     dev_dbg(dev, "%s P%d phy:0x%08x %s\n", __func__, port,
+             phy->phy_id, phy_string_for_interface(phy->interface));
+
+     /*
+      * Enable energy-detect sensing on PHY, used to determine when a PHY
+      * port is physically connected
+      */

What if it's not a PHY port?

Quoted 24 lines
drivers/net/mv88e6xxx.c new file +24 -0
+     val = mv88e6xxx_phy_read(dev, port, PHY_REG_CTRL1);
+     if (val < 0)
+             return val;
+     val = bitfield_replace(val, priv->phy_ctrl1_en_det_shift,
+                            priv->phy_ctrl1_en_det_width,
+                            priv->phy_ctrl1_en_det_ctrl);
+     val = mv88e6xxx_phy_write(dev, port, PHY_REG_CTRL1, val);
+     if (val < 0)
+             return val;
+
+     /* enable port */
+     val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+     if (val < 0)
+             return val;
+     val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+                            PORT_REG_CTRL_PSTATE_WIDTH,
+                            PORT_REG_CTRL_PSTATE_FORWARD);
+     val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+     if (val < 0)
+             return val;
+
+     /* configure RGMII delays for fixed link */
+     if (phy->phy_id == PHY_FIXED_ID) {
+             /* Physical Control register: Table 62 */

drivers/net/mv88e6xxx.c line 666

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+             val = mv88e6xxx_port_read(dev, port, PORT_REG_PHYS_CTRL);
+             val &= ~(PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK ||
+                      PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK);
+             if (phy->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+                 phy->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                     val |= PORT_REG_PHYS_CTRL_RGMII_DELAY_RXCLK;
+             if (phy->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+                 phy->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                     val |= PORT_REG_PHYS_CTRL_RGMII_DELAY_TXCLK;
+             val |= BIT(5) | BIT(4); /* Force link */

The 5 and the 4 are PORT_REG_PHYS_CTRL_LINK_VALUE | PORT_REG_PHYS_CTRL_LINK_FORCE, right? This makes either this or this assignment from mv88e6xxx_fixed_port_setup() redundant:

        if (port == dsa_pdata->cpu_port)
                val |= PORT_REG_PHYS_CTRL_LINK_VALUE |
                       PORT_REG_PHYS_CTRL_LINK_FORCE;

I'd prefer you keep the macros as opposed to the magic values, but force the link unconditionally for all fixed ports, rather than just for the CPU port. There might come support for cascaded DSA ports in the future, and this entire shebang will need to be patched otherwise.

Quoted 6 lines

drivers/net/mv88e6xxx.c line 669

Quoted 3 lines
drivers/net/mv88e6xxx.c new file +3 -0
+             ret = mv88e6xxx_port_write(dev, port, PORT_REG_PHYS_CTRL, val);
+             if (ret < 0)
+                     return ret;

All of this logic from the "if" branch can be moved into mv88e6xxx_fixed_port_setup().

Right... or just roll this fixed port setup code into port_enable

Quoted 34 lines
Quoted 6 lines
drivers/net/mv88e6xxx.c new file +6 -0
+
+             ret = mv88e6xxx_fixed_port_setup(dev, port);
+             if (ret < 0)
+                     return ret;
+     }
+

drivers/net/mv88e6xxx.c line 685

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+     if (port == dsa_pdata->cpu_port) {
+             /* Set CPUDest for cpu port */
+             val = mv88e6xxx_reg_read(dev, priv->global1, GLOBAL1_MON_CTRL);
+             if (val < 0)
+                     return val;
+             val = bitfield_replace(val, GLOBAL1_MON_CTRL_CPUDEST_SHIFT,
+                                    GLOBAL1_MON_CTRL_CPUDEST_WIDTH, port);
+             val = mv88e6xxx_reg_write(dev, priv->global1, GLOBAL1_MON_CTRL, val);
+             if (val < 0)
+                     return val;

Since you don't use DSA/EDSA tags and you are quite averse to them, I don't think you need to set the CPUDest.

drivers/net/mv88e6xxx.c line 698

Quoted 13 lines
drivers/net/mv88e6xxx.c new file +13 -0
+
+             if (mv88e6xxx_6352_family(dev)) {
+                     /* initialize serdes */
+                     val = mv88e6xxx_get_cmode(dev, dsa_pdata->cpu_port);
+                     if (val < 0)
+                             return val;
+                     if (val == PORT_REG_STATUS_CMODE_100BASE_X ||
+                         val == PORT_REG_STATUS_CMODE_1000BASE_X ||
+                         val == PORT_REG_STATUS_CMODE_SGMII) {
+                             val = mv88e6xxx_serdes_init(dev);
+                             if (val < 0)
+                                     return val;
+                     }
Quoted 8 lines

You can/should initialize the SERDES regardless of whether this is the CPU port or not, if the C_MODE dictates so. Otherwise said, the "if (port == dsa_pdata->cpu_port)" check should disappear.

Additionally, you should validate that phy->interface matches what the C_MODE reports for this port (I understand that changing the C_MODE is possible but not exactly without its issues), and report an error on mismatch, to avoid people scratching their heads.

It seems to me that this C_MODE validation should be done only for fixed phy's right?

Is this what you had in mind?

                if (phy->phy_id == PHY_FIXED_ID) {
                        switch (phy->interface) {
                        case PHY_INTERFACE_MODE_RGMII:
                        case PHY_INTERFACE_MODE_RGMII_RXID:
                        case PHY_INTERFACE_MODE_RGMII_TXID:
                        case PHY_INTERFACE_MODE_RGMII_ID:
                                if (val != PORT_REG_STATUS_CMODE_RGMII)
                                        goto mismatch;
                                break;
                        case PHY_INTERFACE_MODE_1000BASEX:
                                if (val != PORT_REG_STATUS_CMODE_1000BASE_X)
                                        goto mismatch;
                                break;

mismatch:
default:
dev_err(dev, "Mismatched PHY mode %s
on port %d!\n",

phy_string_for_interface(phy->interface), port);
                                break;
                        }
                }
Quoted 41 lines
Quoted 12 lines
drivers/net/mv88e6xxx.c new file +11 -0
+             }
+     }
+
+     return 0;
+}
+
+static void mv88e6xxx_port_disable(struct udevice *dev, int port, struct phy_device *phy)
+{
+     int val;
+
+     dev_dbg(dev, "%s P%d phy:0x%x\n", __func__, port, phy->phy_id);

drivers/net/mv88e6xxx.c line 719

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+
+     val = mv88e6xxx_port_read(dev, port, PORT_REG_CTRL);
+     if (val < 0)
+             return;
+     val = bitfield_replace(val, PORT_REG_CTRL_PSTATE_SHIFT,
+                            PORT_REG_CTRL_PSTATE_WIDTH,
+                            PORT_REG_CTRL_PSTATE_DISABLED);
+     val = mv88e6xxx_port_write(dev, port, PORT_REG_CTRL, val);
+     if (val < 0)
+             return;

The assignment of "val" and then its checking is quite useless here, either print an error or remove it.

Quoted 15 lines
drivers/net/mv88e6xxx.c new file +15 -0
+}
+
+static const struct dsa_ops mv88e6xxx_dsa_ops = {
+     .port_enable = mv88e6xxx_port_enable,
+     .port_disable = mv88e6xxx_port_disable,
+};
+
+/* bind and probe the switch mdios */
+static int mv88e6xxx_probe_mdio(struct udevice *dev)
+{
+     struct udevice *mdev;
+     ofnode node, mdios;
+     const char *name;
+     int ret;
+
Quoted 8 lines

drivers/net/mv88e6xxx.c line 738

Quoted 4 lines
drivers/net/mv88e6xxx.c new file +4 -0
+     /* bind phy ports of mdios child node to mv88e6xxx_mdio device */
+     mdios = dev_read_subnode(dev, "mdios");
+     if (!ofnode_valid(mdios))
+             return 0;

I wrote a long, angry comment about the parsing of this "mdios" container node. Please squash the fixup from patch 8/8 into the code here, I just wasted 10 minutes which I'm not getting back.

ya, I'm really sorry about that - I squashed the mdio parsing changes you requested into the wrong patch and wasted your time (not to mention made you angry by appearing to ignore your previous request)

At one time I was merely trying to convert the existing drivers/net/phy/mv88e61xx.c driver to DM/DSA and not rewrite it and I think that was clear as you originally gave me your Reviewed-By tag on v2 [1]. However, that was a long time ago and after a delay on my part submitting a v3 you started to ask me to clean up some things from the original driver while I was at it (which I should have just done to begin with). I hope we are getting close here. I'm not all that familiar with switch architecture so this has been a much larger effort than I thought it would be but I'm happy that we have at least one other board interested in using this DM/DSA version of the driver and would like to keep making progress on obsoleting the original non DM driver.

All of your comments in this review make sense to me with the exception of the C_MODE validation and fixed port config (above).

Best Regards,

Tim

Tim
[1] https://lists.denx.de/pipermail/u-boot/2022-May/484368.html

Quoted 111 lines
Quoted 21 lines
drivers/net/mv88e6xxx.c new file +20 -0
+
+     ofnode_for_each_subnode(node, mdios) {
+             name = ofnode_get_name(node);
+             ret = device_bind_driver_to_node(dev,
+                                              "mv88e6xxx_mdio",
+                                              name, node, NULL);
+             if (ret) {
+                     dev_err(dev, "failed to bind %s: %d\n", name, ret);
+                     continue;
+             }
+
+             /* need to probe it as there is no compatible to do so */
+             ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev);
+             if (ret) {
+                     dev_err(dev, "failed to probe %s: %d\n", name, ret);
+                     continue;
+             }
+     }
+
+     return ret;

drivers/net/mv88e6xxx.c line 768

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+}
+
+static int mv88e6xxx_probe(struct udevice *dev)
+{
+     struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+     struct udevice *master = dsa_get_master(dev);
+     int ret;
+
+     if (!master)
+             return -ENODEV;

Remove this.

You could consider treating the 'status = "disabled";' case, however. Look at sja1105_probe() for example.

drivers/net/mv88e6xxx.c line 770

Quoted 2 lines
drivers/net/mv88e6xxx.c new file +2 -0
+
+     dev_dbg(dev, "%s master:%s\n", __func__, master->name);

Useless variable, please remove it and stop looking at it in probe().

Quoted 36 lines
drivers/net/mv88e6xxx.c new file +36 -0
+
+     /* probe internal mdio bus */
+     ret = mv88e6xxx_probe_mdio(dev);
+     if (ret)
+             return ret;
+
+     ret = mv88e6xxx_priv_reg_offs_pre_init(dev);
+     if (ret)
+             return ret;
+
+     dev_dbg(dev, "ID=0x%x PORT_BASE=0x%02x GLOBAL1=0x%02x GLOBAL2=0x%02x\n",
+             priv->id, priv->port_reg_base, priv->global1, priv->global2);
+     switch (priv->id) {
+     case PORT_SWITCH_ID_6096:
+     case PORT_SWITCH_ID_6097:
+     case PORT_SWITCH_ID_6172:
+     case PORT_SWITCH_ID_6176:
+     case PORT_SWITCH_ID_6240:
+     case PORT_SWITCH_ID_6352:
+             priv->port_count = 11;
+             priv->phy_ctrl1_en_det_shift = 8;
+             priv->phy_ctrl1_en_det_width = 2;
+             priv->phy_ctrl1_en_det_ctrl =
+                     PHY_REG_CTRL1_ENERGY_DET_SENSE_XMIT;
+             break;
+     case PORT_SWITCH_ID_6020:
+     case PORT_SWITCH_ID_6070:
+     case PORT_SWITCH_ID_6071:
+     case PORT_SWITCH_ID_6220:
+     case PORT_SWITCH_ID_6250:
+     case PORT_SWITCH_ID_6320:
+             priv->port_count = 7;
+             priv->phy_ctrl1_en_det_shift = 14;
+             priv->phy_ctrl1_en_det_width = 1;
+             priv->phy_ctrl1_en_det_ctrl =
+                     PHY_REG_CTRL1_ENERGY_DET_SENSE_PULSE;

drivers/net/mv88e6xxx.c line 816

Quoted 10 lines
drivers/net/mv88e6xxx.c new file +10 -0
+             break;
+     default:
+             return -ENODEV;
+     }
+
+     ret = mv88e6xxx_switch_reset(dev);
+     if (ret < 0)
+             return ret;
+
+     dsa_set_tagging(dev, 0, 0);

Just don't call this, it doesn't do anything.

Quoted 20 lines
drivers/net/mv88e6xxx.c new file +17 -1
+
+     return 0;
+}
+
+static const struct udevice_id mv88e6xxx_ids[] = {
+     { .compatible = "marvell,mv88e6085" },
+     { }
+};
+
+U_BOOT_DRIVER(mv88e6xxx) = {
+     .name           = "mv88e6xxx",
+     .id             = UCLASS_DSA,
+     .of_match       = mv88e6xxx_ids,
+     .probe          = mv88e6xxx_probe,
+     .ops            = &mv88e6xxx_dsa_ops,
+     .priv_auto      = sizeof(struct mv88e6xxx_priv),
+};
--

2.25.1

author
#11 lore raw

PATCH v5 8/8 board: gw_ventana: enable MV88E61XX DSA support

In reply to Tim Harvey

Add MV88E61XX DSA support:
- update dt: U-Boot dsa driver requires different device-tree syntax than the linux driver in order to link the dsa ports to the mdio bus.
- update defconfig
- replace mv88e61xx_hw_reset weak override with board_phy_config support for mv88e61xx configuration that is outside the scope of the DSA driver

Note that the dt changes were not placed in a u-boot.dtsi as it is intended that these changes get merged with the Linux dt's.

---
v5:
- fix typo in defconfig s/MV88E61XX/MV88E6XXX
- added Fabio's rb tag
- added note to commit log
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
v3:
- move mdio's mdio@0 subnode
v2: no changes

---
 arch/arm/dts/imx6qdl-gw5904.dtsi        | 31 +++++++++++++++
 board/gateworks/gw_ventana/gw_ventana.c | 50 +++++++++----------------
 configs/gwventana_gw5904_defconfig      |  7 ++--
 drivers/net/mv88e6xxx.c                 | 29 ++++++--------
 4 files changed, 64 insertions(+), 53 deletions(-)
arch/arm/dts/imx6qdl-gw5904.dtsi +31 -0
index 612b6e068e28..487dd7648274 100644
@@ -212,6 +212,27 @@
 			compatible = "marvell,mv88e6085";
 			reg = <0>;
 
+			mdio {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				sw_phy0: ethernet-phy@0 {
+					reg = <0x0>;
+				};
+
+				sw_phy1: ethernet-phy@1 {
+					reg = <0x1>;
+				};
+
+				sw_phy2: ethernet-phy@2 {
+					reg = <0x2>;
+				};
+
+				sw_phy3: ethernet-phy@3 {
+					reg = <0x3>;
+				};
+			};
+
 			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -219,27 +240,37 @@
 				port@0 {
 					reg = <0>;
 					label = "lan4";
+					phy-handle = <&sw_phy0>;
 				};
 
 				port@1 {
 					reg = <1>;
 					label = "lan3";
+					phy-handle = <&sw_phy1>;
 				};
 
 				port@2 {
 					reg = <2>;
 					label = "lan2";
+					phy-handle = <&sw_phy2>;
 				};
 
 				port@3 {
 					reg = <3>;
 					label = "lan1";
+					phy-handle = <&sw_phy3>;
 				};
 
 				port@5 {
 					reg = <5>;
 					label = "cpu";
 					ethernet = <&fec>;
+					phy-mode = "rgmii-id";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+					};
 				};
 			};
 		};
board/gateworks/gw_ventana/gw_ventana.c +18 -32

62 lines not on this page · raw message

configs/gwventana_gw5904_defconfig +3 -4
index fb5870fa5803..50115b21e263 100644
@@ -109,13 +109,12 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
-CONFIG_MV88E61XX_SWITCH=y
-CONFIG_MV88E61XX_CPU_PORT=5
-CONFIG_MV88E61XX_PHY_PORTS=0xf
-CONFIG_MV88E61XX_FIXED_PORTS=0x0
+CONFIG_PHY_FIXED=y
 CONFIG_DM_MDIO=y
+CONFIG_DM_DSA=y
 CONFIG_E1000=y
 CONFIG_FEC_MXC=y
+CONFIG_MV88E6XXX=y
 CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PCIE_IMX=y
drivers/net/mv88e6xxx.c +12 -17
index e59e2464c641..09ce6dd1142d 100644
@@ -728,31 +728,26 @@ static const struct dsa_ops mv88e6xxx_dsa_ops = {
 static int mv88e6xxx_probe_mdio(struct udevice *dev)
 {
 	struct udevice *mdev;
-	ofnode node, mdios;
 	const char *name;
+	ofnode node;
 	int ret;
 
-	/* bind phy ports of mdios child node to mv88e6xxx_mdio device */
-	mdios = dev_read_subnode(dev, "mdios");
-	if (!ofnode_valid(mdios))
+	/* bind phy ports of mdio child node to mv88e6xxx_mdio device */
+	node = dev_read_subnode(dev, "mdio");
+	if (!ofnode_valid(node))
 		return 0;
 
-	ofnode_for_each_subnode(node, mdios) {
-		name = ofnode_get_name(node);
-		ret = device_bind_driver_to_node(dev,
-						 "mv88e6xxx_mdio",
-						 name, node, NULL);
-		if (ret) {
-			dev_err(dev, "failed to bind %s: %d\n", name, ret);
-			continue;
-		}
-
+	name = ofnode_get_name(node);
+	ret = device_bind_driver_to_node(dev,
+					 "mv88e6xxx_mdio",
+					 name, node, NULL);
+	if (ret) {
+		dev_err(dev, "failed to bind %s: %d\n", name, ret);
+	} else {
 		/* need to probe it as there is no compatible to do so */
 		ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev);
-		if (ret) {
+		if (ret)
 			dev_err(dev, "failed to probe %s: %d\n", name, ret);
-			continue;
-		}
 	}
 
 	return ret;
Signature · 1 line
2.25.1
#12 lore raw

Re: [PATCH v5 8/8] board: gw_ventana: enable MV88E61XX DSA support

Quoted 3 lines · Tim Harvey

Add MV88E61XX DSA support:
- update dt: U-Boot dsa driver requires different device-tree syntax than the linux driver in order to link the dsa ports to the mdio bus.

Not really correct. Better said, U-Boot requires a more restrictive subset of what DT bindings Linux supports, for sake of simplicity of the code. It is equally valid to link ports to their internal PHY by phy-handle in the Linux mv88e6xxx driver.

Quoted 77 lines

- update defconfig
- replace mv88e61xx_hw_reset weak override with board_phy_config support for mv88e61xx configuration that is outside the scope of the DSA driver

Note that the dt changes were not placed in a u-boot.dtsi as it is intended that these changes get merged with the Linux dt's.

---
v5:
- fix typo in defconfig s/MV88E61XX/MV88E6XXX
- added Fabio's rb tag
- added note to commit log
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
v3:
- move mdio's mdio@0 subnode
v2: no changes

---
 arch/arm/dts/imx6qdl-gw5904.dtsi        | 31 +++++++++++++++
 board/gateworks/gw_ventana/gw_ventana.c | 50 +++++++++----------------
 configs/gwventana_gw5904_defconfig      |  7 ++--
 drivers/net/mv88e6xxx.c                 | 29 ++++++--------
 4 files changed, 64 insertions(+), 53 deletions(-)
arch/arm/dts/imx6qdl-gw5904.dtsi +24 -0
index 612b6e068e28..487dd7648274 100644
@@ -212,6 +212,27 @@
 			compatible = "marvell,mv88e6085";
 			reg = <0>;
 
+			mdio {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				sw_phy0: ethernet-phy@0 {
+					reg = <0x0>;
+				};
+
+				sw_phy1: ethernet-phy@1 {
+					reg = <0x1>;
+				};
+
+				sw_phy2: ethernet-phy@2 {
+					reg = <0x2>;
+				};
+
+				sw_phy3: ethernet-phy@3 {
+					reg = <0x3>;
+				};
+			};
+
 			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -219,27 +240,37 @@
 				port@0 {
 					reg = <0>;
 					label = "lan4";
+					phy-handle = <&sw_phy0>;
 				};
 
 				port@1 {
 					reg = <1>;
 					label = "lan3";
+					phy-handle = <&sw_phy1>;
 				};
 
 				port@2 {
 					reg = <2>;
 					label = "lan2";
+					phy-handle = <&sw_phy2>;
 				};

arch/arm/dts/imx6qdl-gw5904.dtsi line 266

Quoted 10 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +1 -0
 
 				port@3 {
 					reg = <3>;
 					label = "lan1";
+					phy-handle = <&sw_phy3>;
 				};
 
 				port@5 {
 					reg = <5>;
 					label = "cpu";

This is not used, please remove it.

arch/arm/dts/imx6qdl-gw5904.dtsi line 276

Quoted 10 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +6 -0
 					ethernet = <&fec>;
+					phy-mode = "rgmii-id";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+					};
 				};
 			};
 		};

Binding looks good, thanks.

Quoted 16 lines
board/gateworks/gw_ventana/gw_ventana.c +8 -0
index 99f52b9953e2..1c3da2c82707 100644
@@ -83,44 +83,30 @@ int board_phy_config(struct phy_device *phydev)
 		break;
 	}
 
+	/* Fixed PHY: for GW5904/GW5909 this is Marvell 88E6176 GbE Switch */
+	if (phydev->phy_id == PHY_FIXED_ID &&
+	    (board_type == GW5904 || board_type == GW5909)) {
+		struct mii_dev *bus = miiphy_get_dev_by_name("mdio");
+
+		puts("MV88E61XX ");
+		/* GPIO[0] output CLK125 for RGMII_REFCLK */
+		bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x62 << 8) | 0xfe);

board/gateworks/gw_ventana/gw_ventana.c int board_phy_config(struct phy_device *phydev) · line 103

Quoted 10 lines
board/gateworks/gw_ventana/gw_ventana.c +10 -0
+		bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x68 << 8) | 7);
+
+		/* Port 0-3 LED configuration: Table 80/82 */
+		/* LED configuration: 7:4-green (8=Activity)  3:0 amber (8=Link) */
+		bus->write(bus, 0x10, 0, 0x16, 0x8088);
+		bus->write(bus, 0x11, 0, 0x16, 0x8088);
+		bus->write(bus, 0x12, 0, 0x16, 0x8088);
+		bus->write(bus, 0x13, 0, 0x16, 0x8088);
+	}
+

Ugh. I'll have to get over this.

BTW, does this run before or after the switch driver getting probed? Don't you lose the config once you reset the switch? How do you ensure ordering?

Quoted 100 lines
board/gateworks/gw_ventana/gw_ventana.c +0 -32
 	if (phydev->drv->config)
 		phydev->drv->config(phydev);
 
 	return 0;
 }
 
-#ifdef CONFIG_MV88E61XX_SWITCH
-int mv88e61xx_hw_reset(struct phy_device *phydev)
-{
-	struct mii_dev *bus = phydev->bus;
-
-	/* GPIO[0] output, CLK125 */
-	debug("enabling RGMII_REFCLK\n");
-	bus->write(bus, 0x1c /*MV_GLOBAL2*/, 0,
-		   0x1a /*MV_SCRATCH_MISC*/,
-		   (1 << 15) | (0x62 /*MV_GPIO_DIR*/ << 8) | 0xfe);
-	bus->write(bus, 0x1c /*MV_GLOBAL2*/, 0,
-		   0x1a /*MV_SCRATCH_MISC*/,
-		   (1 << 15) | (0x68 /*MV_GPIO01_CNTL*/ << 8) | 7);
-
-	/* RGMII delay - Physical Control register bit[15:14] */
-	debug("setting port%d RGMII rx/tx delay\n", CONFIG_MV88E61XX_CPU_PORT);
-	/* forced 1000mbps full-duplex link */
-	bus->write(bus, 0x10 + CONFIG_MV88E61XX_CPU_PORT, 0, 1, 0xc0fe);
-	phydev->autoneg = AUTONEG_DISABLE;
-	phydev->speed = SPEED_1000;
-	phydev->duplex = DUPLEX_FULL;
-
-	/* LED configuration: 7:4-green (8=Activity)  3:0 amber (8=Link) */
-	bus->write(bus, 0x10, 0, 0x16, 0x8088);
-	bus->write(bus, 0x11, 0, 0x16, 0x8088);
-	bus->write(bus, 0x12, 0, 0x16, 0x8088);
-	bus->write(bus, 0x13, 0, 0x16, 0x8088);
-
-	return 0;
-}
-#endif // CONFIG_MV88E61XX_SWITCH
-
 #if defined(CONFIG_VIDEO_IPUV3)
 static void enable_hdmi(struct display_info_t const *dev)
 {
configs/gwventana_gw5904_defconfig +3 -4
index fb5870fa5803..50115b21e263 100644
@@ -109,13 +109,12 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
-CONFIG_MV88E61XX_SWITCH=y
-CONFIG_MV88E61XX_CPU_PORT=5
-CONFIG_MV88E61XX_PHY_PORTS=0xf
-CONFIG_MV88E61XX_FIXED_PORTS=0x0
+CONFIG_PHY_FIXED=y
 CONFIG_DM_MDIO=y
+CONFIG_DM_DSA=y
 CONFIG_E1000=y
 CONFIG_FEC_MXC=y
+CONFIG_MV88E6XXX=y
 CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PCIE_IMX=y
drivers/net/mv88e6xxx.c +11 -14
index e59e2464c641..09ce6dd1142d 100644
@@ -728,31 +728,26 @@ static const struct dsa_ops mv88e6xxx_dsa_ops = {
 static int mv88e6xxx_probe_mdio(struct udevice *dev)
 {
 	struct udevice *mdev;
-	ofnode node, mdios;
 	const char *name;
+	ofnode node;
 	int ret;
 
-	/* bind phy ports of mdios child node to mv88e6xxx_mdio device */
-	mdios = dev_read_subnode(dev, "mdios");
-	if (!ofnode_valid(mdios))
+	/* bind phy ports of mdio child node to mv88e6xxx_mdio device */
+	node = dev_read_subnode(dev, "mdio");
+	if (!ofnode_valid(node))
 		return 0;
 
-	ofnode_for_each_subnode(node, mdios) {
-		name = ofnode_get_name(node);
-		ret = device_bind_driver_to_node(dev,
-						 "mv88e6xxx_mdio",
-						 name, node, NULL);
-		if (ret) {
-			dev_err(dev, "failed to bind %s: %d\n", name, ret);
-			continue;
-		}
-
+	name = ofnode_get_name(node);
+	ret = device_bind_driver_to_node(dev,
+					 "mv88e6xxx_mdio",
+					 name, node, NULL);
+	if (ret) {
+		dev_err(dev, "failed to bind %s: %d\n", name, ret);
+	} else {

drivers/net/mv88e6xxx.c static const struct dsa_ops mv88e6xxx_dsa_ops = { · line 753

Quoted 10 lines
drivers/net/mv88e6xxx.c +1 -3
 		/* need to probe it as there is no compatible to do so */
 		ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev);
-		if (ret) {
+		if (ret)
 			dev_err(dev, "failed to probe %s: %d\n", name, ret);
-			continue;
-		}
 	}
 
 	return ret;

Please move this hunk into patch 7/8.

Quoted 3 lines
Signature · 1 line
2.25.1
author
#13 lore raw

Re: [PATCH v5 8/8] board: gw_ventana: enable MV88E61XX DSA support

Quoted 10 lines · Vladimir Oltean
Quoted 3 lines · Tim Harvey

Add MV88E61XX DSA support:
- update dt: U-Boot dsa driver requires different device-tree syntax than the linux driver in order to link the dsa ports to the mdio bus.

Not really correct. Better said, U-Boot requires a more restrictive subset of what DT bindings Linux supports, for sake of simplicity of the code. It is equally valid to link ports to their internal PHY by phy-handle in the Linux mv88e6xxx driver.

Agreed - I will update the commit message now that I understand the MDIO bindings correctly.

Quoted 85 lines
Quoted 85 lines

- update defconfig
- replace mv88e61xx_hw_reset weak override with board_phy_config support for mv88e61xx configuration that is outside the scope of the DSA driver

Note that the dt changes were not placed in a u-boot.dtsi as it is intended that these changes get merged with the Linux dt's.

---
v5:
- fix typo in defconfig s/MV88E61XX/MV88E6XXX
- added Fabio's rb tag
- added note to commit log
v4:
- use standard Linux internal MDIO dt structure
- use PHY_FIXED_ID define
v3:
- move mdio's mdio@0 subnode
v2: no changes

---
 arch/arm/dts/imx6qdl-gw5904.dtsi        | 31 +++++++++++++++
 board/gateworks/gw_ventana/gw_ventana.c | 50 +++++++++----------------
 configs/gwventana_gw5904_defconfig      |  7 ++--
 drivers/net/mv88e6xxx.c                 | 29 ++++++--------
 4 files changed, 64 insertions(+), 53 deletions(-)
arch/arm/dts/imx6qdl-gw5904.dtsi +25 -0
index 612b6e068e28..487dd7648274 100644
@@ -212,6 +212,27 @@
                      compatible = "marvell,mv88e6085";
                      reg = <0>;
 
+                     mdio {
+                             #address-cells = <1>;
+                             #size-cells = <0>;
+
+                             sw_phy0: ethernet-phy@0 {
+                                     reg = <0x0>;
+                             };
+
+                             sw_phy1: ethernet-phy@1 {
+                                     reg = <0x1>;
+                             };
+
+                             sw_phy2: ethernet-phy@2 {
+                                     reg = <0x2>;
+                             };
+
+                             sw_phy3: ethernet-phy@3 {
+                                     reg = <0x3>;
+                             };
+                     };
+
                      ports {
                              #address-cells = <1>;
                              #size-cells = <0>;
@@ -219,27 +240,37 @@
                              port@0 {
                                      reg = <0>;
                                      label = "lan4";
+                                     phy-handle = <&sw_phy0>;
                              };
 
                              port@1 {
                                      reg = <1>;
                                      label = "lan3";
+                                     phy-handle = <&sw_phy1>;
                              };
 
                              port@2 {
                                      reg = <2>;
                                      label = "lan2";
+                                     phy-handle = <&sw_phy2>;
                              };
 
                              port@3 {
                                      reg = <3>;
                                      label = "lan1";
+                                     phy-handle = <&sw_phy3>;
                              };
 
Quoted 5 lines

arch/arm/dts/imx6qdl-gw5904.dtsi line 266

Quoted 3 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +0 -0
                              port@5 {
                                      reg = <5>;
                                      label = "cpu";

This is not used, please remove it.

ok - will remove

Quoted 12 lines

arch/arm/dts/imx6qdl-gw5904.dtsi line 276

Quoted 11 lines
arch/arm/dts/imx6qdl-gw5904.dtsi +6 -0
                                      ethernet = <&fec>;
+                                     phy-mode = "rgmii-id";
+
+                                     fixed-link {
+                                             speed = <1000>;
+                                             full-duplex;
+                                     };
                              };
                      };
              };
Quoted 1 line

Binding looks good, thanks.

Great! Thanks for working through this with me. I will submit that hunk to the Linux dt as well.

Quoted 30 lines
Quoted 17 lines
board/gateworks/gw_ventana/gw_ventana.c +8 -0
index 99f52b9953e2..1c3da2c82707 100644
@@ -83,44 +83,30 @@ int board_phy_config(struct phy_device *phydev)
              break;
      }
 
+     /* Fixed PHY: for GW5904/GW5909 this is Marvell 88E6176 GbE Switch */
+     if (phydev->phy_id == PHY_FIXED_ID &&
+         (board_type == GW5904 || board_type == GW5909)) {
+             struct mii_dev *bus = miiphy_get_dev_by_name("mdio");
+
+             puts("MV88E61XX ");
+             /* GPIO[0] output CLK125 for RGMII_REFCLK */
+             bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x62 << 8) | 0xfe);

board/gateworks/gw_ventana/gw_ventana.c int board_phy_config(struct phy_device *phydev) · line 103

Quoted 10 lines
board/gateworks/gw_ventana/gw_ventana.c +10 -0
+             bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x68 << 8) | 7);
+
+             /* Port 0-3 LED configuration: Table 80/82 */
+             /* LED configuration: 7:4-green (8=Activity)  3:0 amber (8=Link) */
+             bus->write(bus, 0x10, 0, 0x16, 0x8088);
+             bus->write(bus, 0x11, 0, 0x16, 0x8088);
+             bus->write(bus, 0x12, 0, 0x16, 0x8088);
+             bus->write(bus, 0x13, 0, 0x16, 0x8088);
+     }
+

Ugh. I'll have to get over this.

Quoted 4 lines

BTW, does this run before or after the switch driver getting probed? Don't you lose the config once you reset the switch? How do you ensure ordering?

Yes, I know you don't like this code and I do plan on submitting a follow-up patch that adds some defines and/or functions that can be used to make it at least more readable. There are currently around 70 board files that use board_phy_config() to perform direct PHY register writes for gpio/led/pin config for things that are currently not defined well enough via bindings to do in drivers and they all read more or less like the above.

In all the NIC drivers I've looked at the driver probe function performs a phy-reset followed by binding internal mdios, then calls phy_config() at the end of the probe which hooks to the board_phy_config() function that has always been there for per-board obscure register config like this.

Quoted 6 lines
Quoted 6 lines
board/gateworks/gw_ventana/gw_ventana.c +0 -0
      if (phydev->drv->config)
              phydev->drv->config(phydev);
 
      return 0;
 }
 

<snip>

Quoted 47 lines
Quoted 47 lines
drivers/net/mv88e6xxx.c +12 -17
index e59e2464c641..09ce6dd1142d 100644
@@ -728,31 +728,26 @@ static const struct dsa_ops mv88e6xxx_dsa_ops = {
 static int mv88e6xxx_probe_mdio(struct udevice *dev)
 {
      struct udevice *mdev;
-     ofnode node, mdios;
      const char *name;
+     ofnode node;
      int ret;
 
-     /* bind phy ports of mdios child node to mv88e6xxx_mdio device */
-     mdios = dev_read_subnode(dev, "mdios");
-     if (!ofnode_valid(mdios))
+     /* bind phy ports of mdio child node to mv88e6xxx_mdio device */
+     node = dev_read_subnode(dev, "mdio");
+     if (!ofnode_valid(node))
              return 0;
 
-     ofnode_for_each_subnode(node, mdios) {
-             name = ofnode_get_name(node);
-             ret = device_bind_driver_to_node(dev,
-                                              "mv88e6xxx_mdio",
-                                              name, node, NULL);
-             if (ret) {
-                     dev_err(dev, "failed to bind %s: %d\n", name, ret);
-                     continue;
-             }
-
+     name = ofnode_get_name(node);
+     ret = device_bind_driver_to_node(dev,
+                                      "mv88e6xxx_mdio",
+                                      name, node, NULL);
+     if (ret) {
+             dev_err(dev, "failed to bind %s: %d\n", name, ret);
+     } else {
              /* need to probe it as there is no compatible to do so */
              ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev);
-             if (ret) {
+             if (ret)
                      dev_err(dev, "failed to probe %s: %d\n", name, ret);
-                     continue;
-             }
      }
 
Quoted 3 lines

drivers/net/mv88e6xxx.c static const struct dsa_ops mv88e6xxx_dsa_ops = { · line 753

Quoted 1 line
drivers/net/mv88e6xxx.c +0 -0
      return ret;

Please move this hunk into patch 7/8.

Yes, I apologize for this - I squashed the above into this board-specific patch instead of the mv88e6xxx driver patch which caused you to waste some time while reviwing the driver patch.

Best Regards,

Tim