[U-Boot] [PATCH 0/4] Marvell MDIO driver and new MDIO name property

[U-Boot] [PATCH 0/4] Marvell MDIO driver and new MDIO name property

[Alex Marginean]

This is a respin of the original Marvell MDIO driver submitted by Ken about one
year ago, using the new MDIO DM code.
Added binding documents for mdio and marvell-mdio and introduced a new optional
property for naming MDIO buses in case the driver can't reasonably pick a nice
name by itself.

Alex Marginean (4):
  net: mdio-uclass: name MDIO according to device-name property if
    preset
  doc: bindings: add mdio.txt describing generic MDIO properties
  drivers: net: add marvell MDIO driver
  arm: dts: Set custom names for cp110 master/slave MDIO buses

 arch/arm/dts/armada-cp110-master.dtsi         |   1 +
 arch/arm/dts/armada-cp110-slave.dtsi          |   1 +
 doc/device-tree-bindings/net/marvell-mdio.txt |  15 ++
 doc/device-tree-bindings/net/mdio.txt         |  36 +++
 drivers/net/Kconfig                           |  10 +
 drivers/net/Makefile                          |   1 +
 drivers/net/mvmdio.c                          | 236 ++++++++++++++++++
 net/mdio-uclass.c                             |  11 +
 8 files changed, 311 insertions(+)
 create mode 100644 doc/device-tree-bindings/net/marvell-mdio.txt
 create mode 100644 doc/device-tree-bindings/net/mdio.txt
 create mode 100644 drivers/net/mvmdio.c

-- 
2.17.1

[U-Boot] [PATCH 1/4] net: mdio-uclass: name MDIO according to device-name property if preset

[Alex Marginean]

Use the optional property device-name to name the MDIO bus.  This works
around limitations with using the DT node name on devices such as
Armada-8040, which integrates two cp100 cores, both featuring MDIOs at the
same relative offsets and with the same DT node names.
The concept was originally proposed by Marvell as a custom property called
mdio-name specific to Marvell driver.  This patch uses the more generic
property device-name and moves this into MDIO class code so other can use
it as well.

Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
---
 net/mdio-uclass.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 36a404ff44..428f3a994f 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -23,6 +23,17 @@ void dm_mdio_probe_devices(void)
 
 static int dm_mdio_post_bind(struct udevice *dev)
 {
+	const char *dt_name;
+
+	/* set a custom name for the MDIO device, if present in DT */
+	if (ofnode_valid(dev->node)) {
+		dt_name = ofnode_read_string(dev->node, "device-name");
+		if (dt_name) {
+			debug("renaming dev %s to %s\n", dev->name, dt_name);
+			device_set_name(dev, dt_name);
+		}
+	}
+
 	/*
 	 * MDIO command doesn't like spaces in names, don't allow them to keep
 	 * it happy
-- 
2.17.1

[U-Boot] [PATCH 1/4] net: mdio-uclass: name MDIO according to device-name property if preset

[Joe Hershberger]

On Wed, Jul 17, 2019 at 10:11 AM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> Use the optional property device-name to name the MDIO bus.  This works
> around limitations with using the DT node name on devices such as
> Armada-8040, which integrates two cp100 cores, both featuring MDIOs at the
> same relative offsets and with the same DT node names.
> The concept was originally proposed by Marvell as a custom property called
> mdio-name specific to Marvell driver.  This patch uses the more generic
> property device-name and moves this into MDIO class code so other can use
> it as well.
>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 1/4] net: mdio-uclass: name MDIO according to device-name property if preset

[Bin Meng]

On Wed, Jul 17, 2019 at 11:11 PM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> Use the optional property device-name to name the MDIO bus.  This works
> around limitations with using the DT node name on devices such as
> Armada-8040, which integrates two cp100 cores, both featuring MDIOs at the
> same relative offsets and with the same DT node names.
> The concept was originally proposed by Marvell as a custom property called
> mdio-name specific to Marvell driver.  This patch uses the more generic

I was wondering whether such optional custom property name is accepted
by the Linux devicetree committee or yet? The general goal is to use
exact the same DT as kernel uses, at least for ARM, and that is what I
learned from this ML.

> property device-name and moves this into MDIO class code so other can use
> it as well.
>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
> ---
>  net/mdio-uclass.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>

Anyway, the codes LGTM. So

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Bin

[U-Boot] [PATCH 1/4] net: mdio-uclass: name MDIO according to device-name property if preset

[Alex Marginean]

On 7/23/2019 9:38 AM, Bin Meng wrote:
> On Wed, Jul 17, 2019 at 11:11 PM Alex Marginean
> <alexandru.marginean@nxp.com> wrote:
>>
>> Use the optional property device-name to name the MDIO bus.  This works
>> around limitations with using the DT node name on devices such as
>> Armada-8040, which integrates two cp100 cores, both featuring MDIOs at the
>> same relative offsets and with the same DT node names.
>> The concept was originally proposed by Marvell as a custom property called
>> mdio-name specific to Marvell driver.  This patch uses the more generic
> 
> I was wondering whether such optional custom property name is accepted
> by the Linux devicetree committee or yet? The general goal is to use
> exact the same DT as kernel uses, at least for ARM, and that is what I
> learned from this ML.

I didn't ask, my guess is they would not.  The property is not actually
describing HW, plus Linux wouldn't need this name anyway.  As far as I
know MDIOs in Linux are not addressable directly using user-space tools
and for the purpose of probing devices and matching ethernet/PHY/MDIO
this property is not useful.  U-Boot on the other hand has the mdio cmd
which requires unique names and also benefits from friendly names for
MDIO buses.
There are other potential solutions for the unique name problem, like
creating something out of the full DT path of the device, or resolve
absolute base address and use that.  These aren't as easy to use though.

Alex

> 
>> property device-name and moves this into MDIO class code so other can use
>> it as well.
>>
>> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
>> ---
>>   net/mdio-uclass.c | 11 +++++++++++
>>   1 file changed, 11 insertions(+)
>>
> 
> Anyway, the codes LGTM. So
> 
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> 
> Regards,
> Bin
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
> 

[U-Boot] [PATCH 1/4] net: mdio-uclass: name MDIO according to device-name property if preset

[Bin Meng]

Hi Alex,

On Tue, Jul 23, 2019 at 2:51 PM Alex Marginean <alexm.osslist@gmail.com> wrote:
>
> On 7/23/2019 9:38 AM, Bin Meng wrote:
> > On Wed, Jul 17, 2019 at 11:11 PM Alex Marginean
> > <alexandru.marginean@nxp.com> wrote:
> >>
> >> Use the optional property device-name to name the MDIO bus.  This works
> >> around limitations with using the DT node name on devices such as
> >> Armada-8040, which integrates two cp100 cores, both featuring MDIOs at the
> >> same relative offsets and with the same DT node names.
> >> The concept was originally proposed by Marvell as a custom property called
> >> mdio-name specific to Marvell driver.  This patch uses the more generic
> >
> > I was wondering whether such optional custom property name is accepted
> > by the Linux devicetree committee or yet? The general goal is to use
> > exact the same DT as kernel uses, at least for ARM, and that is what I
> > learned from this ML.
>
> I didn't ask, my guess is they would not.  The property is not actually
> describing HW, plus Linux wouldn't need this name anyway.  As far as I
> know MDIOs in Linux are not addressable directly using user-space tools
> and for the purpose of probing devices and matching ethernet/PHY/MDIO
> this property is not useful.  U-Boot on the other hand has the mdio cmd
> which requires unique names and also benefits from friendly names for
> MDIO buses.
> There are other potential solutions for the unique name problem, like
> creating something out of the full DT path of the device, or resolve
> absolute base address and use that.  These aren't as easy to use though.

Thanks for the clarification. Good enough for now :)

Regards,
Bin

[U-Boot] [PATCH 2/4] doc: bindings: add mdio.txt describing generic MDIO properties

[Alex Marginean]

Adds a binding document for mdio.  A notable deviation from corresponding
Linux binding is the introduction of device-name optional property, which
can be used to name MDIO buses.  Two reset optional properties described
by Linux binding are also not present as they don't seem to be used in
U-Boot at this time.

Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
---
 doc/device-tree-bindings/net/mdio.txt | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 doc/device-tree-bindings/net/mdio.txt

diff --git a/doc/device-tree-bindings/net/mdio.txt b/doc/device-tree-bindings/net/mdio.txt
new file mode 100644
index 0000000000..1595325050
--- /dev/null
+++ b/doc/device-tree-bindings/net/mdio.txt
@@ -0,0 +1,36 @@
+Common MDIO bus properties.
+
+These are generic properties that can apply to any MDIO bus.
+
+Optional properties:
+	- device-name - If present it is used to name the device and MDIO bus.
+			The name must be unique and must not contain spaces.
+
+A list of child nodes, one per device on the bus is expected.  These could be
+PHYs, switches or similar devices and child nodes should follow the specific
+binding for the device type.
+
+Example :
+This example shows the structure used for the external MDIO bus on NXP LS1028A
+RDB board.  Note that this MDIO device is an integrated PCI function and
+requires no compatible property for probing.
+
+/* definition in SoC dtsi file */
+	pcie at 1f0000000 {
+
+		mdio0: pci at 0,3 {
+			#address-cells=<0>;
+			#size-cells=<1>;
+			reg = <0x000300 0 0 0 0>;
+			status = "disabled";
+			device-name = "emdio";
+		};
+	};
+/* definition of PHYs in RDB dts file */
+&mdio0 {
+	status = "okay";
+	rdb_phy0: phy at 2 {
+		reg = <2>;
+	};
+};
+
-- 
2.17.1

[U-Boot] [PATCH 2/4] doc: bindings: add mdio.txt describing generic MDIO properties

[Joe Hershberger]

On Wed, Jul 17, 2019 at 10:11 AM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> Adds a binding document for mdio.  A notable deviation from corresponding
> Linux binding is the introduction of device-name optional property, which
> can be used to name MDIO buses.  Two reset optional properties described
> by Linux binding are also not present as they don't seem to be used in
> U-Boot at this time.
>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 2/4] doc: bindings: add mdio.txt describing generic MDIO properties

[Bin Meng]

On Wed, Jul 17, 2019 at 11:11 PM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> Adds a binding document for mdio.  A notable deviation from corresponding
> Linux binding is the introduction of device-name optional property, which
> can be used to name MDIO buses.  Two reset optional properties described
> by Linux binding are also not present as they don't seem to be used in
> U-Boot at this time.
>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
> ---
>  doc/device-tree-bindings/net/mdio.txt | 36 +++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 doc/device-tree-bindings/net/mdio.txt
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[U-Boot] [PATCH 3/4] drivers: net: add marvell MDIO driver

[Alex Marginean]

This patch adds a separate driver for the MDIO interface of the
Marvell Ethernet controllers based on driver model. There are two
reasons to have a separate driver rather than including it inside
the MAC driver itself:
  *) The MDIO interface is shared by all Ethernet ports, so a driver
     must guarantee non-concurrent accesses to this MDIO interface. The
     most logical way is to have a separate driver that handles this
     single MDIO interface, used by all Ethernet ports.
  *) The MDIO interface is the same between the existing mv643xx_eth
     driver and the new mvneta/mvpp2 driver. Even though it is for now
     only used by the mvneta/mvpp2 driver, it will in the future be
     used by the mv643xx_eth driver as well.

This driver supports SMI IEEE for 802.3 Clause 22 and XSMI for IEEE
802.3 Clause 45.

This patch also adds device tree binding for marvell MDIO driver.

Signed-off-by: Ken Ma <make@marvell.com>
Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
---

I would really appreciate some help with testing of this patch as I don't have
access to a Marvell device this would run on.  Probing works, it's easy to test
that.  Nevo Hed has also been kind enough to run an older version of this patch
at his end and it was working for him.  For what is worth the actual driver
code is practically unchanged from the original version sent by Ken, but it's
still a good idea to have someone else verify it.

Thanks!

 doc/device-tree-bindings/net/marvell-mdio.txt |  15 ++
 drivers/net/Kconfig                           |  10 +
 drivers/net/Makefile                          |   1 +
 drivers/net/mvmdio.c                          | 236 ++++++++++++++++++
 4 files changed, 262 insertions(+)
 create mode 100644 doc/device-tree-bindings/net/marvell-mdio.txt
 create mode 100644 drivers/net/mvmdio.c

diff --git a/doc/device-tree-bindings/net/marvell-mdio.txt b/doc/device-tree-bindings/net/marvell-mdio.txt
new file mode 100644
index 0000000000..e2038e2145
--- /dev/null
+++ b/doc/device-tree-bindings/net/marvell-mdio.txt
@@ -0,0 +1,15 @@
+* Marvell MDIO Ethernet Controller interface
+
+The Ethernet controllers of the Marvel Armada 3700 and Armada 7k/8k
+have an identical unit that provides an interface with the MDIO bus.
+This driver handles this MDIO interface.
+
+Mandatory properties:
+SoC specific:
+	- #address-cells: Must be <1>.
+	- #size-cells: Must be <0>.
+	- compatible: Should be "marvell,orion-mdio" (for SMI)
+				"marvell,xmdio"	     (for XSMI)
+	- reg: Base address and size SMI/XMSI bus.
+
+Please refer to "mdio.txt" for generic MDIO bus bindings.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4d85fb1716..a982bc3ac5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -595,4 +595,14 @@ config FSL_ENETC
 	  This driver supports the NXP ENETC Ethernet controller found on some
 	  of the NXP SoCs.
 
+config MVMDIO
+	bool "Marvell MDIO interface support"
+	depends on DM_MDIO
+	help
+	  This driver supports the MDIO interface found in the network
+	  interface units of the Marvell EBU SoCs (Kirkwood, Orion5x,
+	  Dove, Armada 370, Armada XP, Armada 37xx and Armada7K/8K/8KP).
+
+	  This driver is used by the MVPP2 and MVNETA drivers.
+
 endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 97119cec7c..5921fa3e9c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -80,3 +80,4 @@ obj-$(CONFIG_HIGMACV300_ETH) += higmacv300.o
 obj-$(CONFIG_MDIO_SANDBOX) += mdio_sandbox.o
 obj-$(CONFIG_FSL_ENETC) += fsl_enetc.o fsl_enetc_mdio.o
 obj-$(CONFIG_MDIO_MUX_SANDBOX) += mdio_mux_sandbox.o
+obj-$(CONFIG_MVMDIO) += mvmdio.o
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
new file mode 100644
index 0000000000..ec6805e536
--- /dev/null
+++ b/drivers/net/mvmdio.c
@@ -0,0 +1,236 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ * Author: Ken Ma<make@marvell.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <dm/device-internal.h>
+#include <dm/lists.h>
+#include <miiphy.h>
+#include <phy.h>
+#include <asm/io.h>
+#include <wait_bit.h>
+
+#define MVMDIO_SMI_DATA_SHIFT		0
+#define MVMDIO_SMI_PHY_ADDR_SHIFT	16
+#define MVMDIO_SMI_PHY_REG_SHIFT	21
+#define MVMDIO_SMI_READ_OPERATION	BIT(26)
+#define MVMDIO_SMI_WRITE_OPERATION	0
+#define MVMDIO_SMI_READ_VALID		BIT(27)
+#define MVMDIO_SMI_BUSY			BIT(28)
+
+#define MVMDIO_XSMI_MGNT_REG		0x0
+#define MVMDIO_XSMI_PHYADDR_SHIFT	16
+#define MVMDIO_XSMI_DEVADDR_SHIFT	21
+#define MVMDIO_XSMI_WRITE_OPERATION	(0x5 << 26)
+#define MVMDIO_XSMI_READ_OPERATION	(0x7 << 26)
+#define MVMDIO_XSMI_READ_VALID		BIT(29)
+#define MVMDIO_XSMI_BUSY		BIT(30)
+#define MVMDIO_XSMI_ADDR_REG		0x8
+
+enum mvmdio_bus_type {
+	BUS_TYPE_SMI,
+	BUS_TYPE_XSMI
+};
+
+struct mvmdio_priv {
+	void *mdio_base;
+	enum mvmdio_bus_type type;
+};
+
+static int mvmdio_smi_read(struct udevice *dev, int addr,
+			   int devad, int reg)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	u32 val;
+	int ret;
+
+	if (devad != MDIO_DEVAD_NONE)
+		return -EOPNOTSUPP;
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_SMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	writel(((addr << MVMDIO_SMI_PHY_ADDR_SHIFT) |
+		(reg << MVMDIO_SMI_PHY_REG_SHIFT)  |
+		MVMDIO_SMI_READ_OPERATION),
+	       priv->mdio_base);
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_SMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	val = readl(priv->mdio_base);
+	if (!(val & MVMDIO_SMI_READ_VALID)) {
+		pr_err("SMI bus read not valid\n");
+		return -ENODEV;
+	}
+
+	return val & GENMASK(15, 0);
+}
+
+static int mvmdio_smi_write(struct udevice *dev, int addr, int devad,
+			    int reg, u16 value)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	if (devad != MDIO_DEVAD_NONE)
+		return -EOPNOTSUPP;
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_SMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	writel(((addr << MVMDIO_SMI_PHY_ADDR_SHIFT) |
+		(reg << MVMDIO_SMI_PHY_REG_SHIFT)  |
+		MVMDIO_SMI_WRITE_OPERATION            |
+		(value << MVMDIO_SMI_DATA_SHIFT)),
+	       priv->mdio_base);
+
+	return 0;
+}
+
+static int mvmdio_xsmi_read(struct udevice *dev, int addr,
+			    int devad, int reg)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	if (devad == MDIO_DEVAD_NONE)
+		return -EOPNOTSUPP;
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_XSMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	writel(reg & GENMASK(15, 0), priv->mdio_base + MVMDIO_XSMI_ADDR_REG);
+	writel(((addr << MVMDIO_XSMI_PHYADDR_SHIFT) |
+		(devad << MVMDIO_XSMI_DEVADDR_SHIFT) |
+		MVMDIO_XSMI_READ_OPERATION),
+	       priv->mdio_base + MVMDIO_XSMI_MGNT_REG);
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_XSMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	if (!(readl(priv->mdio_base + MVMDIO_XSMI_MGNT_REG) &
+	      MVMDIO_XSMI_READ_VALID)) {
+		pr_err("XSMI bus read not valid\n");
+		return -ENODEV;
+	}
+
+	return readl(priv->mdio_base + MVMDIO_XSMI_MGNT_REG) & GENMASK(15, 0);
+}
+
+static int mvmdio_xsmi_write(struct udevice *dev, int addr, int devad,
+			     int reg, u16 value)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	if (devad == MDIO_DEVAD_NONE)
+		return -EOPNOTSUPP;
+
+	ret = wait_for_bit_le32(priv->mdio_base, MVMDIO_XSMI_BUSY,
+				false, CONFIG_SYS_HZ, false);
+	if (ret < 0)
+		return ret;
+
+	writel(reg & GENMASK(15, 0), priv->mdio_base + MVMDIO_XSMI_ADDR_REG);
+	writel(((addr << MVMDIO_XSMI_PHYADDR_SHIFT) |
+		(devad << MVMDIO_XSMI_DEVADDR_SHIFT) |
+		MVMDIO_XSMI_WRITE_OPERATION | value),
+	       priv->mdio_base + MVMDIO_XSMI_MGNT_REG);
+
+	return 0;
+}
+
+static int mvmdio_read(struct udevice *dev, int addr, int devad, int reg)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	int err = -ENOTSUPP;
+
+	switch (priv->type) {
+	case BUS_TYPE_SMI:
+		err = mvmdio_smi_read(dev, addr, devad, reg);
+		break;
+	case BUS_TYPE_XSMI:
+		err = mvmdio_xsmi_read(dev, addr, devad, reg);
+		break;
+	}
+
+	return err;
+}
+
+static int mvmdio_write(struct udevice *dev, int addr, int devad, int reg,
+			u16 value)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+	int err = -ENOTSUPP;
+
+	switch (priv->type) {
+	case BUS_TYPE_SMI:
+		err = mvmdio_smi_write(dev, addr, devad, reg, value);
+		break;
+	case BUS_TYPE_XSMI:
+		err = mvmdio_xsmi_write(dev, addr, devad, reg, value);
+		break;
+	}
+
+	return err;
+}
+
+/*
+ * Name the device, we use the device tree node name.
+ * This can be overwritten by MDIO class code if device-name property is
+ * present.
+ */
+static int mvmdio_bind(struct udevice *dev)
+{
+	if (ofnode_valid(dev->node))
+		device_set_name(dev, ofnode_get_name(dev->node));
+
+	return 0;
+}
+
+/* Get device base address and type, either C22 SMII or C45 XSMI */
+static int mvmdio_probe(struct udevice *dev)
+{
+	struct mvmdio_priv *priv = dev_get_priv(dev);
+
+	priv->mdio_base = (void *)dev_read_addr(dev);
+	priv->type = (enum mvmdio_bus_type)dev_get_driver_data(dev);
+
+	return 0;
+}
+
+static const struct mdio_ops mvmdio_ops = {
+	.read = mvmdio_read,
+	.write = mvmdio_write,
+};
+
+static const struct udevice_id mvmdio_ids[] = {
+	{ .compatible = "marvell,orion-mdio", .data = BUS_TYPE_SMI },
+	{ .compatible = "marvell,xmdio", .data = BUS_TYPE_XSMI },
+	{ }
+};
+
+U_BOOT_DRIVER(mvmdio) = {
+	.name			= "mvmdio",
+	.id			= UCLASS_MDIO,
+	.of_match		= mvmdio_ids,
+	.bind			= mvmdio_bind,
+	.probe			= mvmdio_probe,
+	.ops			= &mvmdio_ops,
+	.priv_auto_alloc_size	= sizeof(struct mvmdio_priv),
+};
+
-- 
2.17.1

[U-Boot] [PATCH 3/4] drivers: net: add marvell MDIO driver

[Joe Hershberger]

On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> This patch adds a separate driver for the MDIO interface of the
> Marvell Ethernet controllers based on driver model. There are two
> reasons to have a separate driver rather than including it inside
> the MAC driver itself:
>   *) The MDIO interface is shared by all Ethernet ports, so a driver
>      must guarantee non-concurrent accesses to this MDIO interface. The
>      most logical way is to have a separate driver that handles this
>      single MDIO interface, used by all Ethernet ports.
>   *) The MDIO interface is the same between the existing mv643xx_eth
>      driver and the new mvneta/mvpp2 driver. Even though it is for now
>      only used by the mvneta/mvpp2 driver, it will in the future be
>      used by the mv643xx_eth driver as well.
>
> This driver supports SMI IEEE for 802.3 Clause 22 and XSMI for IEEE
> 802.3 Clause 45.
>
> This patch also adds device tree binding for marvell MDIO driver.
>
> Signed-off-by: Ken Ma <make@marvell.com>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Alex Marginean]

Implicitly Marvell MDIO driver uses DT node names for devices, but in this
case that is not unique.  Set MDIO device names for master/slave to
cpm/cps.

Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
---
 arch/arm/dts/armada-cp110-master.dtsi | 1 +
 arch/arm/dts/armada-cp110-slave.dtsi  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi
index 551d00d774..6fb6166b79 100644
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -96,6 +96,7 @@
 				#size-cells = <0>;
 				compatible = "marvell,orion-mdio";
 				reg = <0x12a200 0x10>;
+				device-name = "cpm";
 			};
 
 			cpm_syscon0: system-controller at 440000 {
diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi
index 2ea9004f1d..53c796dad6 100644
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -96,6 +96,7 @@
 				#size-cells = <0>;
 				compatible = "marvell,orion-mdio";
 				reg = <0x12a200 0x10>;
+				device-name = "cps";
 			};
 
 			cps_syscon0: system-controller at 440000 {
-- 
2.17.1

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Joe Hershberger]

On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
<alexandru.marginean@nxp.com> wrote:
>
> Implicitly Marvell MDIO driver uses DT node names for devices, but in this
> case that is not unique.  Set MDIO device names for master/slave to
> cpm/cps.
>
> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Nevo Hed]

Sorry for the late input

The cp110s have an mdio and an xmdio so
Locally I have been naming them cpm-xmdio, cpm-mdio, cps-xmdio, cps-mdio

I knew the new field is coming but didn't catch that the 'dtsi's patch

On Mon, Jul 22, 2019 at 8:30 PM Joe Hershberger <joe.hershberger@ni.com> wrote:
>
> On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
> <alexandru.marginean@nxp.com> wrote:
> >
> > Implicitly Marvell MDIO driver uses DT node names for devices, but in this
> > case that is not unique.  Set MDIO device names for master/slave to
> > cpm/cps.
> >
> > Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Nevo Hed]

Sorry for the late input

The cp110s have an mdio and an xmdio so
Locally I have been naming them cpm-xmdio, cpm-mdio, cps-xmdio, cps-mdio

I knew the new field is coming but didn't catch that the 'dtsi's patch

[also apologies if you get this a second time]

On Mon, Jul 22, 2019 at 8:30 PM Joe Hershberger <joe.hershberger@ni.com> wrote:
>
> On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
> <alexandru.marginean@nxp.com> wrote:
> >
> > Implicitly Marvell MDIO driver uses DT node names for devices, but in this
> > case that is not unique.  Set MDIO device names for master/slave to
> > cpm/cps.
> >
> > Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Nevo Hed]

For context from upstream linux,
https://github.com/torvalds/linux/commit/f66b2aff46eaf0825dbe1560e28fcb845dd2a215

I was intending to submit the parallel change here once fully tested
end-end on our hardware,
but if not too late my proposal is to name the above nodes as
"cpm-mdio" & "cps-mdio"


On Tue, Jul 23, 2019 at 1:03 PM Nevo Hed <nhed+uboot@starry.com> wrote:
>
> Sorry for the late input
>
> The cp110s have an mdio and an xmdio so
> Locally I have been naming them cpm-xmdio, cpm-mdio, cps-xmdio, cps-mdio
>
> I knew the new field is coming but didn't catch that the 'dtsi's patch
>
> [also apologies if you get this a second time]
>
> On Mon, Jul 22, 2019 at 8:30 PM Joe Hershberger <joe.hershberger@ni.com> wrote:
> >
> > On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
> > <alexandru.marginean@nxp.com> wrote:
> > >
> > > Implicitly Marvell MDIO driver uses DT node names for devices, but in this
> > > case that is not unique.  Set MDIO device names for master/slave to
> > > cpm/cps.
> > >
> > > Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
> >
> > Acked-by: Joe Hershberger <joe.hershberger@ni.com>
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot at lists.denx.de
> > https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Alex Marginean]

On 7/23/2019 8:22 PM, Nevo Hed wrote:
> For context from upstream linux,
> https://github.com/torvalds/linux/commit/f66b2aff46eaf0825dbe1560e28fcb845dd2a215
> 
> I was intending to submit the parallel change here once fully tested
> end-end on our hardware,
> but if not too late my proposal is to name the above nodes as
> "cpm-mdio" & "cps-mdio"

I'm OK with "-mdio", I can send a v2.
Please node that I used a property called 'device-name' rather than
'mdio-name', I'm not sure if you want to pick that up too or not.

Thanks!
Alex

> 
> 
> On Tue, Jul 23, 2019 at 1:03 PM Nevo Hed <nhed+uboot@starry.com> wrote:
>>
>> Sorry for the late input
>>
>> The cp110s have an mdio and an xmdio so
>> Locally I have been naming them cpm-xmdio, cpm-mdio, cps-xmdio, cps-mdio
>>
>> I knew the new field is coming but didn't catch that the 'dtsi's patch
>>
>> [also apologies if you get this a second time]
>>
>> On Mon, Jul 22, 2019 at 8:30 PM Joe Hershberger <joe.hershberger@ni.com> wrote:
>>>
>>> On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
>>> <alexandru.marginean@nxp.com> wrote:
>>>>
>>>> Implicitly Marvell MDIO driver uses DT node names for devices, but in this
>>>> case that is not unique.  Set MDIO device names for master/slave to
>>>> cpm/cps.
>>>>
>>>> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
>>>
>>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>>> _______________________________________________
>>> U-Boot mailing list
>>> U-Boot at lists.denx.de
>>> https://lists.denx.de/listinfo/u-boot
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
> 

[U-Boot] [PATCH 4/4] arm: dts: Set custom names for cp110 master/slave MDIO buses

[Joe Hershberger]

On Wed, Jul 24, 2019 at 8:06 AM Alex Marginean <alexm.osslist@gmail.com> wrote:
>
> On 7/23/2019 8:22 PM, Nevo Hed wrote:
> > For context from upstream linux,
> > https://github.com/torvalds/linux/commit/f66b2aff46eaf0825dbe1560e28fcb845dd2a215
> >
> > I was intending to submit the parallel change here once fully tested
> > end-end on our hardware,
> > but if not too late my proposal is to name the above nodes as
> > "cpm-mdio" & "cps-mdio"
>
> I'm OK with "-mdio", I can send a v2.
> Please node that I used a property called 'device-name' rather than
> 'mdio-name', I'm not sure if you want to pick that up too or not.

Let me know when this is settled and I'll take the series.

Thanks,
-Joe

> >
> >
> > On Tue, Jul 23, 2019 at 1:03 PM Nevo Hed <nhed+uboot@starry.com> wrote:
> >>
> >> Sorry for the late input
> >>
> >> The cp110s have an mdio and an xmdio so
> >> Locally I have been naming them cpm-xmdio, cpm-mdio, cps-xmdio, cps-mdio
> >>
> >> I knew the new field is coming but didn't catch that the 'dtsi's patch
> >>
> >> [also apologies if you get this a second time]
> >>
> >> On Mon, Jul 22, 2019 at 8:30 PM Joe Hershberger <joe.hershberger@ni.com> wrote:
> >>>
> >>> On Wed, Jul 17, 2019 at 10:12 AM Alex Marginean
> >>> <alexandru.marginean@nxp.com> wrote:
> >>>>
> >>>> Implicitly Marvell MDIO driver uses DT node names for devices, but in this
> >>>> case that is not unique.  Set MDIO device names for master/slave to
> >>>> cpm/cps.
> >>>>
> >>>> Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
> >>>
> >>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
> >>> _______________________________________________
> >>> U-Boot mailing list
> >>> U-Boot at lists.denx.de
> >>> https://lists.denx.de/listinfo/u-boot
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot at lists.denx.de
> > https://lists.denx.de/listinfo/u-boot
> >
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 0/4] Marvell MDIO driver and new MDIO name property

[Alex Marginean]

+Nevo, I forgot to CC you.
Alex

On 7/17/2019 6:10 PM, Alex Marginean wrote:
> This is a respin of the original Marvell MDIO driver submitted by Ken about one
> year ago, using the new MDIO DM code.
> Added binding documents for mdio and marvell-mdio and introduced a new optional
> property for naming MDIO buses in case the driver can't reasonably pick a nice
> name by itself.
> 
> Alex Marginean (4):
>    net: mdio-uclass: name MDIO according to device-name property if
>      preset
>    doc: bindings: add mdio.txt describing generic MDIO properties
>    drivers: net: add marvell MDIO driver
>    arm: dts: Set custom names for cp110 master/slave MDIO buses
> 
>   arch/arm/dts/armada-cp110-master.dtsi         |   1 +
>   arch/arm/dts/armada-cp110-slave.dtsi          |   1 +
>   doc/device-tree-bindings/net/marvell-mdio.txt |  15 ++
>   doc/device-tree-bindings/net/mdio.txt         |  36 +++
>   drivers/net/Kconfig                           |  10 +
>   drivers/net/Makefile                          |   1 +
>   drivers/net/mvmdio.c                          | 236 ++++++++++++++++++
>   net/mdio-uclass.c                             |  11 +
>   8 files changed, 311 insertions(+)
>   create mode 100644 doc/device-tree-bindings/net/marvell-mdio.txt
>   create mode 100644 doc/device-tree-bindings/net/mdio.txt
>   create mode 100644 drivers/net/mvmdio.c
>