Skip to contentSkip to conversation

airoha: add MDIO + PCS support

RFC PATCH In review Christian Marangi 2 participants 10 messages Aug 22, 2025 – Aug 25, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover airoha: add MDIO + PCS support

This initial series rework the MT7531 to a dedicated driver to add support for AN7581 (based on MT7988 Switch).

Also add support for configuring the PCS to setup the Serdes port.

Posting as RFC to have some comments about the rework of the MT7531.

Christian Marangi (5):
net: mediatek: move MT7531 mdio to dedicated driver
net: airoha: bind MDIO controller on Ethernet load
net: airoha: add support for Airoha PCS driver
net: airoha: fill in support for PCS in Airoha Ethernet driver
airoha: add PCS node for AN7581

 arch/arm/dts/an7581-u-boot.dtsi        |   71 ++
 arch/arm/dts/en7581-evb-u-boot.dtsi    |   18 +
 drivers/net/Kconfig                    |    7 +
 drivers/net/Makefile                   |    5 +
 drivers/net/airoha/Kconfig             |   12 +
 drivers/net/airoha/Makefile            |    6 +
 drivers/net/airoha/pcs-airoha-common.c |  803 ++++++++++++++
 drivers/net/airoha/pcs-airoha.h        | 1216 +++++++++++++++++++++
 drivers/net/airoha/pcs-an7581.c        | 1369 ++++++++++++++++++++++++
 drivers/net/airoha_eth.c               |  115 ++
 drivers/net/mdio-mt7531.c              |  140 +++
 drivers/net/mdio-mt7531.h              |    9 +
 drivers/net/mtk_eth/Kconfig            |    1 +
 drivers/net/mtk_eth/mt753x.c           |   29 +-
 drivers/net/mtk_eth/mt753x.h           |    3 +
 15 files changed, 3784 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/airoha/Kconfig
 create mode 100644 drivers/net/airoha/Makefile
 create mode 100644 drivers/net/airoha/pcs-airoha-common.c
 create mode 100644 drivers/net/airoha/pcs-airoha.h
 create mode 100644 drivers/net/airoha/pcs-an7581.c
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
Signature · 1 line
2.50.0
#1 lore raw

RFC PATCH 1/5 net: mediatek: move MT7531 mdio to dedicated driver

In preparation for support of MDIO on AN7581, move the MT7531 logic to a dedicated driver and permit usage of the mdio read/write function to the mtk_eth driver.

Minor changes are required to mtk_eth for this change as the dedicated MDIO driver only needs info of the GSW register and nothing else.

This permits Airoha driver to make use of DM_MDIO to bind for the MT7531 driver that have the same exact register.

---
 drivers/net/Kconfig          |   3 +
 drivers/net/Makefile         |   4 +
 drivers/net/mdio-mt7531.c    | 140 +++++++++++++++++++++++++++++++++++
 drivers/net/mdio-mt7531.h    |   9 +++
 drivers/net/mtk_eth/Kconfig  |   1 +
 drivers/net/mtk_eth/mt753x.c |  29 +++-----
 drivers/net/mtk_eth/mt753x.h |   3 +
 7 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
drivers/net/Kconfig +3 -0
index d1cb69f85ad..9ac9bee46c9 100644
@@ -966,6 +966,9 @@ config TSEC_ENET
 	  This driver implements support for the (Enhanced) Three-Speed
 	  Ethernet Controller found on Freescale SoCs.
 
+config MDIO_MT7531
+	bool
+
 source "drivers/net/mtk_eth/Kconfig"
 
 config HIFEMAC_ETH
drivers/net/Makefile +4 -0
index f8f9a71f815..beb7864adc2 100644
@@ -62,7 +62,11 @@ obj-$(CONFIG_LITEETH) += liteeth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
+<<<<<<< HEAD
 obj-$(CONFIG_MDIO_GPIO_BITBANG) += mdio_gpio.o
+=======
+obj-$(CONFIG_MDIO_MT7531) += mdio-mt7531.o
+>>>>>>> net: mediatek: move MT7531 mdio to dedicated driver
 obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o
 obj-$(CONFIG_MDIO_MUX_MESON_G12A) += mdio_mux_meson_g12a.o
 obj-$(CONFIG_MDIO_MUX_MESON_GXL) += mdio_mux_meson_gxl.o
drivers/net/mdio-mt7531.c new file +140 -0

140 lines not on this page · raw message

drivers/net/mdio-mt7531.h new file +9 -0
new file mode 100644
index 00000000000..ee096112f92
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+struct mt7531_mdio_priv {
+	phys_addr_t switch_regs;
+};
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int reg);
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+		      int reg, u16 value);
drivers/net/mtk_eth/Kconfig +1 -0
index e8cdf408237..67b2b612b1a 100644
@@ -4,6 +4,7 @@ config MEDIATEK_ETH
 	select PHYLIB
 	select DM_GPIO
 	select DM_RESET
+	select MDIO_MT7531
 	help
 	  This Driver support MediaTek Ethernet GMAC
 	  Say Y to enable support for the MediaTek Ethernet GMAC.
drivers/net/mtk_eth/mt753x.c +9 -20
index cdd52f3ff1b..cf643f336d6 100644
@@ -138,8 +138,8 @@ int mt7531_mii_read(struct mt753x_switch_priv *priv, u8 phy, u8 reg)
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-	return mt7531_mii_rw(priv, phy_addr, reg, 0, MDIO_CMD_READ,
-			     MDIO_ST_C22);
+	return mt7531_mdio_read(&priv->mdio_priv, phy_addr, MDIO_DEVAD_NONE,
+				reg);
 }
 
 int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
@@ -151,48 +151,36 @@ int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-	return mt7531_mii_rw(priv, phy_addr, reg, val, MDIO_CMD_WRITE,
-			     MDIO_ST_C22);
+	return mt7531_mdio_write(&priv->mdio_priv, phy_addr, MDIO_DEVAD_NONE,
+				 reg, val);
 }
 
 int mt7531_mmd_read(struct mt753x_switch_priv *priv, u8 addr, u8 devad,
 		    u16 reg)
 {
 	u8 phy_addr;
-	int ret;
 
 	if (addr >= MT753X_NUM_PHYS)
 		return -EINVAL;
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-	ret = mt7531_mii_rw(priv, phy_addr, devad, reg, MDIO_CMD_ADDR,
-			    MDIO_ST_C45);
-	if (ret)
-		return ret;
-
-	return mt7531_mii_rw(priv, phy_addr, devad, 0, MDIO_CMD_READ_C45,
-			     MDIO_ST_C45);
+	return mt7531_mdio_read(&priv->mdio_priv, phy_addr, devad,
+				reg);
 }
 
 int mt7531_mmd_write(struct mt753x_switch_priv *priv, u8 addr, u8 devad,
 		     u16 reg, u16 val)
 {
 	u8 phy_addr;
-	int ret;
 
 	if (addr >= MT753X_NUM_PHYS)
 		return 0;
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-	ret = mt7531_mii_rw(priv, phy_addr, devad, reg, MDIO_CMD_ADDR,
-			    MDIO_ST_C45);
-	if (ret)
-		return ret;
-
-	return mt7531_mii_rw(priv, phy_addr, devad, val, MDIO_CMD_WRITE,
-			     MDIO_ST_C45);
+	return mt7531_mdio_write(&priv->mdio_priv, phy_addr, devad,
+				 reg, val);
 }
 
 static int mt7531_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
@@ -224,6 +212,7 @@ int mt7531_mdio_register(struct mt753x_switch_priv *priv)
 	if (!mdio_bus)
 		return -ENOMEM;
 
+	priv->mdio_priv.switch_regs = priv->epriv.ethsys_base + GSW_BASE;
 	mdio_bus->read = mt7531_mdio_read;
 	mdio_bus->write = mt7531_mdio_write;
 	snprintf(mdio_bus->name, sizeof(mdio_bus->name), priv->epriv.sw->name);
drivers/net/mtk_eth/mt753x.h +3 -0
index 65046a1421c..cd128ad39fe 100644
@@ -14,6 +14,8 @@
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
 
+#include "../mdio-mt7531.h"
+
 struct mtk_eth_priv;
 
 #define MT753X_NUM_PHYS		5
@@ -254,6 +256,7 @@ struct mtk_eth_priv;
 
 struct mt753x_switch_priv {
 	struct mtk_eth_switch_priv epriv;
+	struct mt7531_mdio_priv mdio_priv;
 	struct mii_dev *mdio_bus;
 	u32 smi_addr;
 	u32 phy_base;
Signature · 1 line
2.50.0
#2 lore raw

Re: [RFC PATCH 1/5] net: mediatek: move MT7531 mdio to dedicated driver

Quoted 42 lines · Christian Marangi

In preparation for support of MDIO on AN7581, move the MT7531 logic to a dedicated driver and permit usage of the mdio read/write function to the mtk_eth driver.

Minor changes are required to mtk_eth for this change as the dedicated MDIO driver only needs info of the GSW register and nothing else.

This permits Airoha driver to make use of DM_MDIO to bind for the MT7531 driver that have the same exact register.

---
 drivers/net/Kconfig          |   3 +
 drivers/net/Makefile         |   4 +
 drivers/net/mdio-mt7531.c    | 140 +++++++++++++++++++++++++++++++++++
 drivers/net/mdio-mt7531.h    |   9 +++
 drivers/net/mtk_eth/Kconfig  |   1 +
 drivers/net/mtk_eth/mt753x.c |  29 +++-----
 drivers/net/mtk_eth/mt753x.h |   3 +
 7 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
drivers/net/Kconfig +3 -0
index d1cb69f85ad..9ac9bee46c9 100644
@@ -966,6 +966,9 @@ config TSEC_ENET
 	  This driver implements support for the (Enhanced) Three-Speed
 	  Ethernet Controller found on Freescale SoCs.
 
+config MDIO_MT7531
+	bool
+
 source "drivers/net/mtk_eth/Kconfig"
 
 config HIFEMAC_ETH
drivers/net/Makefile +0 -0
index f8f9a71f815..beb7864adc2 100644

drivers/net/Makefile obj-$(CONFIG_LITEETH) += liteeth.o · line 69

Quoted 8 lines
drivers/net/Makefile +4 -0
@@ -62,7 +62,11 @@ obj-$(CONFIG_LITEETH) += liteeth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
+<<<<<<< HEAD
 obj-$(CONFIG_MDIO_GPIO_BITBANG) += mdio_gpio.o
+=======
+obj-$(CONFIG_MDIO_MT7531) += mdio-mt7531.o
+>>>>>>> net: mediatek: move MT7531 mdio to dedicated driver

This merge conflict slipped in and will be fixed in the next revision. These changes were tested locally on an AN7581 RFB board.

Quoted 278 lines
drivers/net/Makefile +0 -0
 obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o
 obj-$(CONFIG_MDIO_MUX_MESON_G12A) += mdio_mux_meson_g12a.o
 obj-$(CONFIG_MDIO_MUX_MESON_GXL) += mdio_mux_meson_gxl.o
drivers/net/mdio-mt7531.c new file +140 -0
new file mode 100644
index 00000000000..4772c9b5407
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <asm/io.h>
+#include <dm.h>
+#include <linux/bitfield.h>
+#include <linux/iopoll.h>
+#include <miiphy.h>
+
+#define MT7531_PHY_IAC			0x701c
+#define   MT7531_PHY_ACS_ST		BIT(31)
+#define   MT7531_MDIO_REG_ADDR_CL22	GENMASK(29, 25)
+#define   MT7531_MDIO_DEV_ADDR		MT7531_MDIO_REG_ADDR_CL22
+#define   MT7531_MDIO_PHY_ADDR		GENMASK(24, 20)
+#define   MT7531_MDIO_CMD		GENMASK(19, 18)
+#define   MT7531_MDIO_CMD_READ_CL45	FIELD_PREP_CONST(MT7531_MDIO_CMD, 0x3)
+#define   MT7531_MDIO_CMD_READ_CL22	FIELD_PREP_CONST(MT7531_MDIO_CMD, 0x2)
+#define   MT7531_MDIO_CMD_WRITE		FIELD_PREP_CONST(MT7531_MDIO_CMD, 0x1)
+#define   MT7531_MDIO_CMD_ADDR		FIELD_PREP_CONST(MT7531_MDIO_CMD, 0x0)
+#define   MT7531_MDIO_ST		GENMASK(17, 16)
+#define   MT7531_MDIO_ST_CL22		FIELD_PREP_CONST(MT7531_MDIO_ST, 0x1)
+#define   MT7531_MDIO_ST_CL45		FIELD_PREP_CONST(MT7531_MDIO_ST, 0x0)
+#define   MT7531_MDIO_RW_DATA		GENMASK(15, 0)
+#define   MT7531_MDIO_REG_ADDR_CL45	MT7531_MDIO_RW_DATA
+
+#define MT7531_MDIO_TIMEOUT		100000
+#define MT7531_MDIO_SLEEP		20
+
+struct mt7531_mdio_priv {
+	phys_addr_t switch_regs;
+};
+
+static int mt7531_mdio_wait_busy(struct mt7531_mdio_priv *priv)
+{
+	unsigned int busy;
+
+	return readl_poll_sleep_timeout(priv->switch_regs + MT7531_PHY_IAC,
+					busy, (busy & MT7531_PHY_ACS_ST) == 0,
+					MT7531_MDIO_SLEEP, MT7531_MDIO_TIMEOUT);
+}
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int reg)
+{
+	struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+	u32 val;
+
+	if (devad != MDIO_DEVAD_NONE) {
+		if (mt7531_mdio_wait_busy(priv))
+			return -ETIMEDOUT;
+
+		val = MT7531_PHY_ACS_ST |
+		      MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+		      FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+		      FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+		      FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+		writel(val, priv->switch_regs + MT7531_PHY_IAC);
+	}
+
+	if (mt7531_mdio_wait_busy(priv))
+		return -ETIMEDOUT;
+
+	val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr);
+	if (devad != MDIO_DEVAD_NONE)
+		val |= MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_READ_CL45 |
+		       FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+	else
+		val |= MT7531_MDIO_ST_CL22 | MT7531_MDIO_CMD_READ_CL22 |
+		       FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+	writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+	if (mt7531_mdio_wait_busy(priv))
+		return -ETIMEDOUT;
+
+	val = readl(priv->switch_regs + MT7531_PHY_IAC);
+	return val & MT7531_MDIO_RW_DATA;
+}
+
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+		      int reg, u16 value)
+{
+	struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+	u32 val;
+
+	if (devad != MDIO_DEVAD_NONE) {
+		if (mt7531_mdio_wait_busy(priv))
+			return -ETIMEDOUT;
+
+		val = MT7531_PHY_ACS_ST |
+		      MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+		      FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+		      FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+		      FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+		writel(val, priv->switch_regs + MT7531_PHY_IAC);
+	}
+
+	if (mt7531_mdio_wait_busy(priv))
+		return -ETIMEDOUT;
+
+	val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+	      MT7531_MDIO_CMD_WRITE | FIELD_PREP(MT7531_MDIO_RW_DATA, value);
+	if (devad != MDIO_DEVAD_NONE)
+		val |= MT7531_MDIO_ST_CL45 |
+		       FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+	else
+		val |= MT7531_MDIO_ST_CL22 |
+		       FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+	writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+	if (mt7531_mdio_wait_busy(priv))
+		return -ETIMEDOUT;
+
+	return 0;
+}
+
+static const struct mdio_ops mt7531_mdio_ops = {
+	.read = mt7531_mdio_read,
+	.write = mt7531_mdio_write,
+};
+
+static int mt7531_mdio_probe(struct udevice *dev)
+{
+	struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+
+	priv->switch_regs = dev_read_addr(dev);
+	if (priv->switch_regs == FDT_ADDR_T_NONE)
+		return -EINVAL;
+
+	return 0;
+}
+
+U_BOOT_DRIVER(mt7531_mdio) = {
+	.name           = "mt7531-mdio",
+	.id             = UCLASS_MDIO,
+	.probe          = mt7531_mdio_probe,
+	.ops            = &mt7531_mdio_ops,
+	.priv_auto	  = sizeof(struct mt7531_mdio_priv),
+};
drivers/net/mdio-mt7531.h new file +9 -0
new file mode 100644
index 00000000000..ee096112f92
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+struct mt7531_mdio_priv {
+	phys_addr_t switch_regs;
+};
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int reg);
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+		      int reg, u16 value);
drivers/net/mtk_eth/Kconfig +1 -0
index e8cdf408237..67b2b612b1a 100644
@@ -4,6 +4,7 @@ config MEDIATEK_ETH
 	select PHYLIB
 	select DM_GPIO
 	select DM_RESET
+	select MDIO_MT7531
 	help
 	  This Driver support MediaTek Ethernet GMAC
 	  Say Y to enable support for the MediaTek Ethernet GMAC.
drivers/net/mtk_eth/mt753x.c +9 -20
index cdd52f3ff1b..cf643f336d6 100644
@@ -138,8 +138,8 @@ int mt7531_mii_read(struct mt753x_switch_priv *priv, u8 phy, u8 reg)
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-	return mt7531_mii_rw(priv, phy_addr, reg, 0, MDIO_CMD_READ,
-			     MDIO_ST_C22);
+	return mt7531_mdio_read(&priv->mdio_priv, phy_addr, MDIO_DEVAD_NONE,
+				reg);
 }
 
 int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
@@ -151,48 +151,36 @@ int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-	return mt7531_mii_rw(priv, phy_addr, reg, val, MDIO_CMD_WRITE,
-			     MDIO_ST_C22);
+	return mt7531_mdio_write(&priv->mdio_priv, phy_addr, MDIO_DEVAD_NONE,
+				 reg, val);
 }
 
 int mt7531_mmd_read(struct mt753x_switch_priv *priv, u8 addr, u8 devad,
 		    u16 reg)
 {
 	u8 phy_addr;
-	int ret;
 
 	if (addr >= MT753X_NUM_PHYS)
 		return -EINVAL;
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-	ret = mt7531_mii_rw(priv, phy_addr, devad, reg, MDIO_CMD_ADDR,
-			    MDIO_ST_C45);
-	if (ret)
-		return ret;
-
-	return mt7531_mii_rw(priv, phy_addr, devad, 0, MDIO_CMD_READ_C45,
-			     MDIO_ST_C45);
+	return mt7531_mdio_read(&priv->mdio_priv, phy_addr, devad,
+				reg);
 }
 
 int mt7531_mmd_write(struct mt753x_switch_priv *priv, u8 addr, u8 devad,
 		     u16 reg, u16 val)
 {
 	u8 phy_addr;
-	int ret;
 
 	if (addr >= MT753X_NUM_PHYS)
 		return 0;
 
 	phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-	ret = mt7531_mii_rw(priv, phy_addr, devad, reg, MDIO_CMD_ADDR,
-			    MDIO_ST_C45);
-	if (ret)
-		return ret;
-
-	return mt7531_mii_rw(priv, phy_addr, devad, val, MDIO_CMD_WRITE,
-			     MDIO_ST_C45);
+	return mt7531_mdio_write(&priv->mdio_priv, phy_addr, devad,
+				 reg, val);
 }
 
 static int mt7531_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
@@ -224,6 +212,7 @@ int mt7531_mdio_register(struct mt753x_switch_priv *priv)
 	if (!mdio_bus)
 		return -ENOMEM;
 
+	priv->mdio_priv.switch_regs = priv->epriv.ethsys_base + GSW_BASE;
 	mdio_bus->read = mt7531_mdio_read;
 	mdio_bus->write = mt7531_mdio_write;
 	snprintf(mdio_bus->name, sizeof(mdio_bus->name), priv->epriv.sw->name);
drivers/net/mtk_eth/mt753x.h +3 -0
index 65046a1421c..cd128ad39fe 100644
@@ -14,6 +14,8 @@
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
 
+#include "../mdio-mt7531.h"
+
 struct mtk_eth_priv;
 
 #define MT753X_NUM_PHYS		5
@@ -254,6 +256,7 @@ struct mtk_eth_priv;
 
 struct mt753x_switch_priv {
 	struct mtk_eth_switch_priv epriv;
+	struct mt7531_mdio_priv mdio_priv;
 	struct mii_dev *mdio_bus;
 	u32 smi_addr;
 	u32 phy_base;
Signature · 1 line
2.50.0
Signature · 1 line
	Ansuel
#3 lore raw

Re: [RFC PATCH 1/5] net: mediatek: move MT7531 mdio to dedicated driver

Quoted 349 lines · Christian Marangi

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 48 lines · Christian Marangi

In preparation for support of MDIO on AN7581, move the MT7531 logic to a
dedicated driver and permit usage of the mdio read/write function to the
mtk_eth driver.

Minor changes are required to mtk_eth for this change as the dedicated
MDIO driver only needs info of the GSW register and nothing else.

This permits Airoha driver to make use of DM_MDIO to bind for the MT7531
driver that have the same exact register.

---
 drivers/net/Kconfig          |   3 +
 drivers/net/Makefile         |   4 +
 drivers/net/mdio-mt7531.c    | 140
+++++++++++++++++++++++++++++++++++
 drivers/net/mdio-mt7531.h    |   9 +++
 drivers/net/mtk_eth/Kconfig  |   1 +
 drivers/net/mtk_eth/mt753x.c |  29 +++-----
 drivers/net/mtk_eth/mt753x.h |   3 +
 7 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
drivers/net/Kconfig +0 -0
index d1cb69f85ad..9ac9bee46c9 100644
@@ -966,6 +966,9 @@ config TSEC_ENET
        This driver implements support for the (Enhanced) Three-

Speed
Ethernet Controller found on Freescale SoCs.

drivers/net/Kconfig +3 -0
+config MDIO_MT7531
+     bool
+
 source "drivers/net/mtk_eth/Kconfig"
 
 config HIFEMAC_ETH
drivers/net/Makefile +0 -0
index f8f9a71f815..beb7864adc2 100644

drivers/net/Makefile obj-$(CONFIG_LITEETH) += liteeth.o · line 69

Quoted 8 lines
drivers/net/Makefile +4 -0
@@ -62,7 +62,11 @@ obj-$(CONFIG_LITEETH) += liteeth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
+<<<<<<< HEAD
 obj-$(CONFIG_MDIO_GPIO_BITBANG) += mdio_gpio.o
+=======
+obj-$(CONFIG_MDIO_MT7531) += mdio-mt7531.o
+>>>>>>> net: mediatek: move MT7531 mdio to dedicated driver

This merge conflict slipped in and will be fixed in the next revision.
These changes were tested locally on an AN7581 RFB board.

Quoted 283 lines
drivers/net/Makefile +0 -0
 obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o
 obj-$(CONFIG_MDIO_MUX_MESON_G12A) += mdio_mux_meson_g12a.o
 obj-$(CONFIG_MDIO_MUX_MESON_GXL) += mdio_mux_meson_gxl.o
drivers/net/mdio-mt7531.c new file +12 -0
new file mode 100644
index 00000000000..4772c9b5407
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <asm/io.h>
+#include <dm.h>
+#include <linux/bitfield.h>
+#include <linux/iopoll.h>
+#include <miiphy.h>
+
+#define MT7531_PHY_IAC                       0x701c
+#define   MT7531_PHY_ACS_ST          BIT(31)
+#define   MT7531_MDIO_REG_ADDR_CL22  GENMASK(29, 25)
+#define   MT7531_MDIO_DEV_ADDR               MT7531_MDIO_REG_ADDR_

CL22

drivers/net/mdio-mt7531.c new file +3 -0
+#define   MT7531_MDIO_PHY_ADDR               GENMASK(24, 20)
+#define   MT7531_MDIO_CMD            GENMASK(19, 18)
+#define   MT7531_MDIO_CMD_READ_CL45  FIELD_PREP_CONST(MT7531_MDIO_

CMD, 0x3)
+#define MT7531_MDIO_CMD_READ_CL22 FIELD_PREP_CONST(MT7531_MDIO_
CMD, 0x2)
+#define MT7531_MDIO_CMD_WRITE FIELD_PREP_CONST(MT75
31_MDIO_CMD, 0x1)
+#define MT7531_MDIO_CMD_ADDR FIELD_PREP_CONST(MT75
31_MDIO_CMD, 0x0)

drivers/net/mdio-mt7531.c new file +2 -0
+#define   MT7531_MDIO_ST             GENMASK(17, 16)
+#define   MT7531_MDIO_ST_CL22                FIELD_PREP_CONST(MT75

31_MDIO_ST, 0x1)
+#define MT7531_MDIO_ST_CL45 FIELD_PREP_CONST(MT75
31_MDIO_ST, 0x0)

drivers/net/mdio-mt7531.c new file +15 -0
+#define   MT7531_MDIO_RW_DATA                GENMASK(15, 0)
+#define   MT7531_MDIO_REG_ADDR_CL45  MT7531_MDIO_RW_DATA
+
+#define MT7531_MDIO_TIMEOUT          100000
+#define MT7531_MDIO_SLEEP            20
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+static int mt7531_mdio_wait_busy(struct mt7531_mdio_priv *priv)
+{
+     unsigned int busy;
+
+     return readl_poll_sleep_timeout(priv->switch_regs +

MT7531_PHY_IAC,
+ busy, (busy &
MT7531_PHY_ACS_ST) == 0,
+ MT7531_MDIO_SLEEP,
MT7531_MDIO_TIMEOUT);

drivers/net/mdio-mt7531.c new file +3 -0
+}
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int

reg)

drivers/net/mdio-mt7531.c new file +21 -0
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR,

addr);

drivers/net/mdio-mt7531.c new file +2 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |

MT7531_MDIO_CMD_READ_CL45 |

drivers/net/mdio-mt7531.c new file +3 -0
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |

MT7531_MDIO_CMD_READ_CL22 |

drivers/net/mdio-mt7531.c new file +34 -0
+                    FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = readl(priv->switch_regs + MT7531_PHY_IAC);
+     return val & MT7531_MDIO_RW_DATA;
+}
+
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+                   int reg, u16 value)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR,

addr) |
+ MT7531_MDIO_CMD_WRITE | FIELD_PREP(MT7531_MDIO_RW_DATA,
value);

drivers/net/mdio-mt7531.c new file +38 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |
+                    FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     return 0;
+}
+
+static const struct mdio_ops mt7531_mdio_ops = {
+     .read = mt7531_mdio_read,
+     .write = mt7531_mdio_write,
+};
+
+static int mt7531_mdio_probe(struct udevice *dev)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+
+     priv->switch_regs = dev_read_addr(dev);
+     if (priv->switch_regs == FDT_ADDR_T_NONE)
+             return -EINVAL;
+
+     return 0;
+}
+
+U_BOOT_DRIVER(mt7531_mdio) = {
+     .name           = "mt7531-mdio",
+     .id             = UCLASS_MDIO,
+     .probe          = mt7531_mdio_probe,
+     .ops            = &mt7531_mdio_ops,
+     .priv_auto        = sizeof(struct mt7531_mdio_priv),
+};
drivers/net/mdio-mt7531.h new file +7 -0
new file mode 100644
index 00000000000..ee096112f92
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int

reg);

drivers/net/mdio-mt7531.h new file +2 -0
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+                   int reg, u16 value);
drivers/net/mtk_eth/Kconfig +1 -0
index e8cdf408237..67b2b612b1a 100644
@@ -4,6 +4,7 @@ config MEDIATEK_ETH
      select PHYLIB
      select DM_GPIO
      select DM_RESET
+     select MDIO_MT7531
      help
        This Driver support MediaTek Ethernet GMAC
        Say Y to enable support for the MediaTek Ethernet GMAC.
drivers/net/mtk_eth/mt753x.c +2 -2
index cdd52f3ff1b..cf643f336d6 100644
@@ -138,8 +138,8 @@ int mt7531_mii_read(struct mt753x_switch_priv
 *priv, u8 phy, u8 reg)
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-     return mt7531_mii_rw(priv, phy_addr, reg, 0, MDIO_CMD_READ,
-                          MDIO_ST_C22);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr,
 MDIO_DEVAD_NONE,
+                             reg);
 }

int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8
reg, u16 val)

drivers/net/mtk_eth/mt753x.c +4 -12
@@ -151,48 +151,36 @@ int mt7531_mii_write(struct
 mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-     return mt7531_mii_rw(priv, phy_addr, reg, val,
 MDIO_CMD_WRITE,
-                          MDIO_ST_C22);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr,
 MDIO_DEVAD_NONE,
+                              reg, val);
 }
 
 int mt7531_mmd_read(struct mt753x_switch_priv *priv, u8 addr, u8
 devad,
                  u16 reg)
 {
      u8 phy_addr;
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return -EINVAL;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,
 MDIO_CMD_ADDR,
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, 0,
 MDIO_CMD_READ_C45,
-                          MDIO_ST_C45);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr, devad,
+                             reg);
 }
 
 int mt7531_mmd_write(struct mt753x_switch_priv *priv, u8 addr, u8
 devad,
                   u16 reg, u16 val)
 {
      u8 phy_addr;
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return 0;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,

MDIO_CMD_ADDR,

drivers/net/mtk_eth/mt753x.c +0 -5
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, val,

MDIO_CMD_WRITE,

drivers/net/mtk_eth/mt753x.c +2 -1
-                          MDIO_ST_C45);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr, devad,
+                              reg, val);
 }
 
 static int mt7531_mdio_read(struct mii_dev *bus, int addr, int

devad, int reg)

drivers/net/mtk_eth/mt753x.c +0 -0
@@ -224,6 +212,7 @@ int mt7531_mdio_register(struct
 mt753x_switch_priv *priv)
      if (!mdio_bus)
              return -ENOMEM;
 
Quoted 2 lines

drivers/net/mtk_eth/mt753x.c int mt7531_mdio_register(struct · line 217

Quoted 2 lines
drivers/net/mtk_eth/mt753x.c +1 -0
+     priv->mdio_priv.switch_regs = priv->epriv.ethsys_base +
 GSW_BASE;

This will break all other platforms using dedicated MT7531 IC.

Only mt7988 uses built-in mt7531 which allows memory-mapped register access. Other platforms connects mt7531 through MDIO bus and only supports accessing registers with MDIO.

You should either change only mt7988 to use this logic, or modify the mdio-mt7531 to accept MDIO-based access.

Quoted 32 lines
Quoted 27 lines
drivers/net/mtk_eth/mt753x.c +0 -0
      mdio_bus->read = mt7531_mdio_read;
      mdio_bus->write = mt7531_mdio_write;
      snprintf(mdio_bus->name, sizeof(mdio_bus->name), priv-
Quoted 1 line

epriv.sw->name);

drivers/net/mtk_eth/mt753x.h +3 -1
index 65046a1421c..cd128ad39fe 100644
@@ -14,6 +14,8 @@
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
 
+#include "../mdio-mt7531.h"
+
 struct mtk_eth_priv;
 
 #define MT753X_NUM_PHYS              5
@@ -254,6 +256,7 @@ struct mtk_eth_priv;
 
 struct mt753x_switch_priv {
      struct mtk_eth_switch_priv epriv;
+     struct mt7531_mdio_priv mdio_priv;
      struct mii_dev *mdio_bus;
      u32 smi_addr;
      u32 phy_base;
--
Quoted 2 lines

2.50.0

--
Ansuel

#4 lore raw

Re: [RFC PATCH 1/5] net: mediatek: move MT7531 mdio to dedicated driver

Quoted 355 lines · Weijie Gao (高惟杰)
Quoted 349 lines · Christian Marangi

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 48 lines · Christian Marangi

In preparation for support of MDIO on AN7581, move the MT7531 logic to a
dedicated driver and permit usage of the mdio read/write function to the
mtk_eth driver.

Minor changes are required to mtk_eth for this change as the dedicated
MDIO driver only needs info of the GSW register and nothing else.

This permits Airoha driver to make use of DM_MDIO to bind for the MT7531
driver that have the same exact register.

---
 drivers/net/Kconfig          |   3 +
 drivers/net/Makefile         |   4 +
 drivers/net/mdio-mt7531.c    | 140
+++++++++++++++++++++++++++++++++++
 drivers/net/mdio-mt7531.h    |   9 +++
 drivers/net/mtk_eth/Kconfig  |   1 +
 drivers/net/mtk_eth/mt753x.c |  29 +++-----
 drivers/net/mtk_eth/mt753x.h |   3 +
 7 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
drivers/net/Kconfig +0 -0
index d1cb69f85ad..9ac9bee46c9 100644
@@ -966,6 +966,9 @@ config TSEC_ENET
        This driver implements support for the (Enhanced) Three-

Speed
Ethernet Controller found on Freescale SoCs.

drivers/net/Kconfig +3 -0
+config MDIO_MT7531
+     bool
+
 source "drivers/net/mtk_eth/Kconfig"
 
 config HIFEMAC_ETH
drivers/net/Makefile +0 -0
index f8f9a71f815..beb7864adc2 100644

drivers/net/Makefile obj-$(CONFIG_LITEETH) += liteeth.o · line 69

Quoted 8 lines
drivers/net/Makefile +4 -0
@@ -62,7 +62,11 @@ obj-$(CONFIG_LITEETH) += liteeth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
+<<<<<<< HEAD
 obj-$(CONFIG_MDIO_GPIO_BITBANG) += mdio_gpio.o
+=======
+obj-$(CONFIG_MDIO_MT7531) += mdio-mt7531.o
+>>>>>>> net: mediatek: move MT7531 mdio to dedicated driver

This merge conflict slipped in and will be fixed in the next revision.
These changes were tested locally on an AN7581 RFB board.

Quoted 283 lines
drivers/net/Makefile +0 -0
 obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o
 obj-$(CONFIG_MDIO_MUX_MESON_G12A) += mdio_mux_meson_g12a.o
 obj-$(CONFIG_MDIO_MUX_MESON_GXL) += mdio_mux_meson_gxl.o
drivers/net/mdio-mt7531.c new file +12 -0
new file mode 100644
index 00000000000..4772c9b5407
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <asm/io.h>
+#include <dm.h>
+#include <linux/bitfield.h>
+#include <linux/iopoll.h>
+#include <miiphy.h>
+
+#define MT7531_PHY_IAC                       0x701c
+#define   MT7531_PHY_ACS_ST          BIT(31)
+#define   MT7531_MDIO_REG_ADDR_CL22  GENMASK(29, 25)
+#define   MT7531_MDIO_DEV_ADDR               MT7531_MDIO_REG_ADDR_

CL22

drivers/net/mdio-mt7531.c new file +3 -0
+#define   MT7531_MDIO_PHY_ADDR               GENMASK(24, 20)
+#define   MT7531_MDIO_CMD            GENMASK(19, 18)
+#define   MT7531_MDIO_CMD_READ_CL45  FIELD_PREP_CONST(MT7531_MDIO_

CMD, 0x3)
+#define MT7531_MDIO_CMD_READ_CL22 FIELD_PREP_CONST(MT7531_MDIO_
CMD, 0x2)
+#define MT7531_MDIO_CMD_WRITE FIELD_PREP_CONST(MT75
31_MDIO_CMD, 0x1)
+#define MT7531_MDIO_CMD_ADDR FIELD_PREP_CONST(MT75
31_MDIO_CMD, 0x0)

drivers/net/mdio-mt7531.c new file +2 -0
+#define   MT7531_MDIO_ST             GENMASK(17, 16)
+#define   MT7531_MDIO_ST_CL22                FIELD_PREP_CONST(MT75

31_MDIO_ST, 0x1)
+#define MT7531_MDIO_ST_CL45 FIELD_PREP_CONST(MT75
31_MDIO_ST, 0x0)

drivers/net/mdio-mt7531.c new file +15 -0
+#define   MT7531_MDIO_RW_DATA                GENMASK(15, 0)
+#define   MT7531_MDIO_REG_ADDR_CL45  MT7531_MDIO_RW_DATA
+
+#define MT7531_MDIO_TIMEOUT          100000
+#define MT7531_MDIO_SLEEP            20
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+static int mt7531_mdio_wait_busy(struct mt7531_mdio_priv *priv)
+{
+     unsigned int busy;
+
+     return readl_poll_sleep_timeout(priv->switch_regs +

MT7531_PHY_IAC,
+ busy, (busy &
MT7531_PHY_ACS_ST) == 0,
+ MT7531_MDIO_SLEEP,
MT7531_MDIO_TIMEOUT);

drivers/net/mdio-mt7531.c new file +3 -0
+}
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int

reg)

drivers/net/mdio-mt7531.c new file +21 -0
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR,

addr);

drivers/net/mdio-mt7531.c new file +2 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |

MT7531_MDIO_CMD_READ_CL45 |

drivers/net/mdio-mt7531.c new file +3 -0
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |

MT7531_MDIO_CMD_READ_CL22 |

drivers/net/mdio-mt7531.c new file +34 -0
+                    FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = readl(priv->switch_regs + MT7531_PHY_IAC);
+     return val & MT7531_MDIO_RW_DATA;
+}
+
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+                   int reg, u16 value)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR |
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST | FIELD_PREP(MT7531_MDIO_PHY_ADDR,

addr) |
+ MT7531_MDIO_CMD_WRITE | FIELD_PREP(MT7531_MDIO_RW_DATA,
value);

drivers/net/mdio-mt7531.c new file +38 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |
+                    FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22, reg);
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     return 0;
+}
+
+static const struct mdio_ops mt7531_mdio_ops = {
+     .read = mt7531_mdio_read,
+     .write = mt7531_mdio_write,
+};
+
+static int mt7531_mdio_probe(struct udevice *dev)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+
+     priv->switch_regs = dev_read_addr(dev);
+     if (priv->switch_regs == FDT_ADDR_T_NONE)
+             return -EINVAL;
+
+     return 0;
+}
+
+U_BOOT_DRIVER(mt7531_mdio) = {
+     .name           = "mt7531-mdio",
+     .id             = UCLASS_MDIO,
+     .probe          = mt7531_mdio_probe,
+     .ops            = &mt7531_mdio_ops,
+     .priv_auto        = sizeof(struct mt7531_mdio_priv),
+};
drivers/net/mdio-mt7531.h new file +7 -0
new file mode 100644
index 00000000000..ee096112f92
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad, int

reg);

drivers/net/mdio-mt7531.h new file +2 -0
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,
+                   int reg, u16 value);
drivers/net/mtk_eth/Kconfig +1 -0
index e8cdf408237..67b2b612b1a 100644
@@ -4,6 +4,7 @@ config MEDIATEK_ETH
      select PHYLIB
      select DM_GPIO
      select DM_RESET
+     select MDIO_MT7531
      help
        This Driver support MediaTek Ethernet GMAC
        Say Y to enable support for the MediaTek Ethernet GMAC.
drivers/net/mtk_eth/mt753x.c +2 -2
index cdd52f3ff1b..cf643f336d6 100644
@@ -138,8 +138,8 @@ int mt7531_mii_read(struct mt753x_switch_priv
 *priv, u8 phy, u8 reg)
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-     return mt7531_mii_rw(priv, phy_addr, reg, 0, MDIO_CMD_READ,
-                          MDIO_ST_C22);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr,
 MDIO_DEVAD_NONE,
+                             reg);
 }

int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy, u8
reg, u16 val)

drivers/net/mtk_eth/mt753x.c +4 -12
@@ -151,48 +151,36 @@ int mt7531_mii_write(struct
 mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-     return mt7531_mii_rw(priv, phy_addr, reg, val,
 MDIO_CMD_WRITE,
-                          MDIO_ST_C22);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr,
 MDIO_DEVAD_NONE,
+                              reg, val);
 }
 
 int mt7531_mmd_read(struct mt753x_switch_priv *priv, u8 addr, u8
 devad,
                  u16 reg)
 {
      u8 phy_addr;
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return -EINVAL;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,
 MDIO_CMD_ADDR,
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, 0,
 MDIO_CMD_READ_C45,
-                          MDIO_ST_C45);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr, devad,
+                             reg);
 }
 
 int mt7531_mmd_write(struct mt753x_switch_priv *priv, u8 addr, u8
 devad,
                   u16 reg, u16 val)
 {
      u8 phy_addr;
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return 0;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,

MDIO_CMD_ADDR,

drivers/net/mtk_eth/mt753x.c +0 -5
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, val,

MDIO_CMD_WRITE,

drivers/net/mtk_eth/mt753x.c +2 -1
-                          MDIO_ST_C45);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr, devad,
+                              reg, val);
 }
 
 static int mt7531_mdio_read(struct mii_dev *bus, int addr, int

devad, int reg)

drivers/net/mtk_eth/mt753x.c +0 -0
@@ -224,6 +212,7 @@ int mt7531_mdio_register(struct
 mt753x_switch_priv *priv)
      if (!mdio_bus)
              return -ENOMEM;
 
Quoted 2 lines

drivers/net/mtk_eth/mt753x.c int mt7531_mdio_register(struct · line 217

Quoted 2 lines
drivers/net/mtk_eth/mt753x.c +1 -0
+     priv->mdio_priv.switch_regs = priv->epriv.ethsys_base +
 GSW_BASE;

This will break all other platforms using dedicated MT7531 IC.

Quoted 7 lines

Only mt7988 uses built-in mt7531 which allows memory-mapped register access. Other platforms connects mt7531 through MDIO bus and only supports accessing registers with MDIO.

You should either change only mt7988 to use this logic, or modify the mdio-mt7531 to accept MDIO-based access.

Thanks for the feedback.

I can rework the MDIO driver to regmap and use that or limit it only to mt7988. What do you prefer?

I think limiting to mt7988 is easier?

Quoted 32 lines
Quoted 32 lines
Quoted 27 lines
drivers/net/mtk_eth/mt753x.c +0 -0
      mdio_bus->read = mt7531_mdio_read;
      mdio_bus->write = mt7531_mdio_write;
      snprintf(mdio_bus->name, sizeof(mdio_bus->name), priv-
Quoted 1 line

epriv.sw->name);

drivers/net/mtk_eth/mt753x.h +3 -1
index 65046a1421c..cd128ad39fe 100644
@@ -14,6 +14,8 @@
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
 
+#include "../mdio-mt7531.h"
+
 struct mtk_eth_priv;
 
 #define MT753X_NUM_PHYS              5
@@ -254,6 +256,7 @@ struct mtk_eth_priv;
 
 struct mt753x_switch_priv {
      struct mtk_eth_switch_priv epriv;
+     struct mt7531_mdio_priv mdio_priv;
      struct mii_dev *mdio_bus;
      u32 smi_addr;
      u32 phy_base;
--
Quoted 2 lines

2.50.0

--
Ansuel

Signature · 1 line
	Ansuel
#5 lore raw

Re: [RFC PATCH 1/5] net: mediatek: move MT7531 mdio to dedicated driver

Quoted 405 lines · Christian Marangi

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 390 lines · Weijie Gao (高惟杰)
Quoted 384 lines · Christian Marangi

External email : Please do not click links or open attachments until
you have verified the sender or the content.

Quoted 53 lines · Christian Marangi

In preparation for support of MDIO on AN7581, move the MT7531 logic
to a
dedicated driver and permit usage of the mdio read/write function
to the
mtk_eth driver.

Minor changes are required to mtk_eth for this change as the dedicated
MDIO driver only needs info of the GSW register and nothing else.

This permits Airoha driver to make use of DM_MDIO to bind for the
MT7531
driver that have the same exact register.

---
 drivers/net/Kconfig          |   3 +
 drivers/net/Makefile         |   4 +
 drivers/net/mdio-mt7531.c    | 140
+++++++++++++++++++++++++++++++++++
 drivers/net/mdio-mt7531.h    |   9 +++
 drivers/net/mtk_eth/Kconfig  |   1 +
 drivers/net/mtk_eth/mt753x.c |  29 +++-----
 drivers/net/mtk_eth/mt753x.h |   3 +
 7 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 drivers/net/mdio-mt7531.c
 create mode 100644 drivers/net/mdio-mt7531.h
drivers/net/Kconfig +0 -0
index d1cb69f85ad..9ac9bee46c9 100644
@@ -966,6 +966,9 @@ config TSEC_ENET
        This driver implements support for the (Enhanced)

Three-
Speed
Ethernet Controller found on Freescale SoCs.

drivers/net/Kconfig +3 -0
+config MDIO_MT7531
+     bool
+
 source "drivers/net/mtk_eth/Kconfig"
 
 config HIFEMAC_ETH
drivers/net/Makefile +0 -0
index f8f9a71f815..beb7864adc2 100644

drivers/net/Makefile obj-$(CONFIG_LITEETH) += liteeth.o · line 69

Quoted 8 lines
drivers/net/Makefile +4 -0
@@ -62,7 +62,11 @@ obj-$(CONFIG_LITEETH) += liteeth.o
 obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 obj-$(CONFIG_MDIO_IPQ4019) += mdio-ipq4019.o
+<<<<<<< HEAD
 obj-$(CONFIG_MDIO_GPIO_BITBANG) += mdio_gpio.o
+=======
+obj-$(CONFIG_MDIO_MT7531) += mdio-mt7531.o
+>>>>>>> net: mediatek: move MT7531 mdio to dedicated driver

This merge conflict slipped in and will be fixed in the next revision.
These changes were tested locally on an AN7581 RFB board.

Quoted 311 lines
drivers/net/Makefile +0 -0
 obj-$(CONFIG_MDIO_MUX_I2CREG) += mdio_mux_i2creg.o
 obj-$(CONFIG_MDIO_MUX_MESON_G12A) += mdio_mux_meson_g12a.o
 obj-$(CONFIG_MDIO_MUX_MESON_GXL) += mdio_mux_meson_gxl.o
drivers/net/mdio- renamed from drivers/net/mdio-mt7531.c +0 -0

mt7531.c
new file mode 100644
index 00000000000..4772c9b5407

drivers/net/mdio-mt7531.c new file +12 -0
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <asm/io.h>
+#include <dm.h>
+#include <linux/bitfield.h>
+#include <linux/iopoll.h>
+#include <miiphy.h>
+
+#define MT7531_PHY_IAC                       0x701c
+#define   MT7531_PHY_ACS_ST          BIT(31)
+#define   MT7531_MDIO_REG_ADDR_CL22  GENMASK(29, 25)
+#define   MT7531_MDIO_DEV_ADDR               MT7531_MDIO_REG_A

DDR_
CL22

drivers/net/mdio-mt7531.c new file +3 -0
+#define   MT7531_MDIO_PHY_ADDR               GENMASK(24, 20)
+#define   MT7531_MDIO_CMD            GENMASK(19, 18)
+#define   MT7531_MDIO_CMD_READ_CL45  FIELD_PREP_CONST(MT7531_M

DIO_
CMD, 0x3)
+#define MT7531_MDIO_CMD_READ_CL22 FIELD_PREP_CONST(MT7531_M
DIO_
CMD, 0x2)
+#define MT7531_MDIO_CMD_WRITE FIELD_PREP_CONST(
MT75
31_MDIO_CMD, 0x1)
+#define MT7531_MDIO_CMD_ADDR FIELD_PREP_CONST(
MT75
31_MDIO_CMD, 0x0)

drivers/net/mdio-mt7531.c new file +2 -0
+#define   MT7531_MDIO_ST             GENMASK(17, 16)
+#define   MT7531_MDIO_ST_CL22                FIELD_PREP_CONST(

MT75
31_MDIO_ST, 0x1)
+#define MT7531_MDIO_ST_CL45 FIELD_PREP_CONST(
MT75
31_MDIO_ST, 0x0)

drivers/net/mdio-mt7531.c new file +11 -0
+#define   MT7531_MDIO_RW_DATA                GENMASK(15, 0)
+#define   MT7531_MDIO_REG_ADDR_CL45  MT7531_MDIO_RW_DATA
+
+#define MT7531_MDIO_TIMEOUT          100000
+#define MT7531_MDIO_SLEEP            20
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+static int mt7531_mdio_wait_busy(struct mt7531_mdio_priv

*priv)

drivers/net/mdio-mt7531.c new file +4 -0
+{
+     unsigned int busy;
+
+     return readl_poll_sleep_timeout(priv->switch_regs +

MT7531_PHY_IAC,
+ busy, (busy &
MT7531_PHY_ACS_ST) == 0,
+ MT7531_MDIO_SLEEP,
MT7531_MDIO_TIMEOUT);

drivers/net/mdio-mt7531.c new file +3 -0
+}
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad,

int
reg)

drivers/net/mdio-mt7531.c new file +10 -0
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR

|

drivers/net/mdio-mt7531.c new file +11 -0
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST |

FIELD_PREP(MT7531_MDIO_PHY_ADDR,
addr);

drivers/net/mdio-mt7531.c new file +2 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |

MT7531_MDIO_CMD_READ_CL45 |

drivers/net/mdio-mt7531.c new file +3 -0
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |

MT7531_MDIO_CMD_READ_CL22 |
+ FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22,
reg);

drivers/net/mdio-mt7531.c new file +11 -0
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = readl(priv->switch_regs + MT7531_PHY_IAC);
+     return val & MT7531_MDIO_RW_DATA;
+}
+
+int mt7531_mdio_write(struct udevice *dev, int addr, int

devad,

drivers/net/mdio-mt7531.c new file +11 -0
+                   int reg, u16 value)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+     u32 val;
+
+     if (devad != MDIO_DEVAD_NONE) {
+             if (mt7531_mdio_wait_busy(priv))
+                     return -ETIMEDOUT;
+
+             val = MT7531_PHY_ACS_ST |
+                   MT7531_MDIO_ST_CL45 | MT7531_MDIO_CMD_ADDR

|

drivers/net/mdio-mt7531.c new file +11 -0
+                   FIELD_PREP(MT7531_MDIO_PHY_ADDR, addr) |
+                   FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad) |
+                   FIELD_PREP(MT7531_MDIO_REG_ADDR_CL45, reg);
+
+             writel(val, priv->switch_regs + MT7531_PHY_IAC);
+     }
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     val = MT7531_PHY_ACS_ST |

FIELD_PREP(MT7531_MDIO_PHY_ADDR,
addr) |
+ MT7531_MDIO_CMD_WRITE |
FIELD_PREP(MT7531_MDIO_RW_DATA,
value);

drivers/net/mdio-mt7531.c new file +6 -0
+     if (devad != MDIO_DEVAD_NONE)
+             val |= MT7531_MDIO_ST_CL45 |
+                    FIELD_PREP(MT7531_MDIO_DEV_ADDR, devad);
+     else
+             val |= MT7531_MDIO_ST_CL22 |
+                    FIELD_PREP(MT7531_MDIO_REG_ADDR_CL22,

reg);

drivers/net/mdio-mt7531.c new file +32 -0
+
+     writel(val, priv->switch_regs + MT7531_PHY_IAC);
+
+     if (mt7531_mdio_wait_busy(priv))
+             return -ETIMEDOUT;
+
+     return 0;
+}
+
+static const struct mdio_ops mt7531_mdio_ops = {
+     .read = mt7531_mdio_read,
+     .write = mt7531_mdio_write,
+};
+
+static int mt7531_mdio_probe(struct udevice *dev)
+{
+     struct mt7531_mdio_priv *priv = dev_get_priv(dev);
+
+     priv->switch_regs = dev_read_addr(dev);
+     if (priv->switch_regs == FDT_ADDR_T_NONE)
+             return -EINVAL;
+
+     return 0;
+}
+
+U_BOOT_DRIVER(mt7531_mdio) = {
+     .name           = "mt7531-mdio",
+     .id             = UCLASS_MDIO,
+     .probe          = mt7531_mdio_probe,
+     .ops            = &mt7531_mdio_ops,
+     .priv_auto        = sizeof(struct mt7531_mdio_priv),
+};
drivers/net/mdio- renamed from drivers/net/mdio-mt7531.h +0 -0

mt7531.h
new file mode 100644
index 00000000000..ee096112f92

drivers/net/mdio-mt7531.h new file +7 -0
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+struct mt7531_mdio_priv {
+     phys_addr_t switch_regs;
+};
+
+int mt7531_mdio_read(struct udevice *dev, int addr, int devad,

int
reg);
+int mt7531_mdio_write(struct udevice *dev, int addr, int devad,

drivers/net/mdio-mt7531.h new file +1 -0
+                   int reg, u16 value);
drivers/net/mtk_eth/Kconfig +1 -0
index e8cdf408237..67b2b612b1a 100644
@@ -4,6 +4,7 @@ config MEDIATEK_ETH
      select PHYLIB
      select DM_GPIO
      select DM_RESET
+     select MDIO_MT7531
      help
        This Driver support MediaTek Ethernet GMAC
        Say Y to enable support for the MediaTek Ethernet GMAC.
drivers/net/mtk_eth/mt753x.c +0 -0
index cdd52f3ff1b..cf643f336d6 100644
@@ -138,8 +138,8 @@ int mt7531_mii_read(struct

mt753x_switch_priv
*priv, u8 phy, u8 reg)

      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);

- return mt7531_mii_rw(priv, phy_addr, reg, 0,
MDIO_CMD_READ,

drivers/net/mtk_eth/mt753x.c +1 -1
-                          MDIO_ST_C22);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr,

MDIO_DEVAD_NONE,
+ reg);
}

int mt7531_mii_write(struct mt753x_switch_priv *priv, u8 phy,
u8
reg, u16 val)

drivers/net/mtk_eth/mt753x.c +2 -2
@@ -151,48 +151,36 @@ int mt7531_mii_write(struct
 mt753x_switch_priv *priv, u8 phy, u8 reg, u16 val)
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, phy);
 
-     return mt7531_mii_rw(priv, phy_addr, reg, val,
 MDIO_CMD_WRITE,
-                          MDIO_ST_C22);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr,
 MDIO_DEVAD_NONE,
+                              reg, val);
 }
 
 int mt7531_mmd_read(struct mt753x_switch_priv *priv, u8 addr,

u8
devad,

                  u16 reg)
 {
      u8 phy_addr;
drivers/net/mtk_eth/mt753x.c +0 -2
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return -EINVAL;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,

MDIO_CMD_ADDR,

drivers/net/mtk_eth/mt753x.c +0 -5
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, 0,

MDIO_CMD_READ_C45,

drivers/net/mtk_eth/mt753x.c +1 -1
-                          MDIO_ST_C45);
+     return mt7531_mdio_read(&priv->mdio_priv, phy_addr,

devad,
+ reg);
}

int mt7531_mmd_write(struct mt753x_switch_priv *priv, u8 addr,
u8
devad,

                   u16 reg, u16 val)
 {
      u8 phy_addr;
drivers/net/mtk_eth/mt753x.c +0 -2
-     int ret;
 
      if (addr >= MT753X_NUM_PHYS)
              return 0;
 
      phy_addr = MT753X_PHY_ADDR(priv->phy_base, addr);
 
-     ret = mt7531_mii_rw(priv, phy_addr, devad, reg,

MDIO_CMD_ADDR,

drivers/net/mtk_eth/mt753x.c +0 -5
-                         MDIO_ST_C45);
-     if (ret)
-             return ret;
-
-     return mt7531_mii_rw(priv, phy_addr, devad, val,

MDIO_CMD_WRITE,

drivers/net/mtk_eth/mt753x.c +1 -1
-                          MDIO_ST_C45);
+     return mt7531_mdio_write(&priv->mdio_priv, phy_addr,

devad,
+ reg, val);
}

static int mt7531_mdio_read(struct mii_dev *bus, int addr, int
devad, int reg)

drivers/net/mtk_eth/mt753x.c +0 -0
@@ -224,6 +212,7 @@ int mt7531_mdio_register(struct
 mt753x_switch_priv *priv)
      if (!mdio_bus)
              return -ENOMEM;
 
Quoted 2 lines

drivers/net/mtk_eth/mt753x.c int mt7531_mdio_register(struct · line 217

Quoted 2 lines
drivers/net/mtk_eth/mt753x.c +1 -0
+     priv->mdio_priv.switch_regs = priv->epriv.ethsys_base +
 GSW_BASE;

This will break all other platforms using dedicated MT7531 IC.

Quoted 9 lines

Only mt7988 uses built-in mt7531 which allows memory-mapped register
access. Other platforms connects mt7531 through MDIO bus and only supports accessing registers with MDIO.

You should either change only mt7988 to use this logic, or modify the
mdio-mt7531 to accept MDIO-based access.

Quoted 8 lines

Thanks for the feedback.

I can rework the MDIO driver to regmap and use that or limit it only to
mt7988. What do you prefer?

I think limiting to mt7988 is easier?

Agree. Better only for mt7988.

Quoted 36 lines
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
drivers/net/mtk_eth/mt753x.c +0 -0
      mdio_bus->read = mt7531_mdio_read;
      mdio_bus->write = mt7531_mdio_write;
      snprintf(mdio_bus->name, sizeof(mdio_bus->name), priv-
Quoted 1 line

epriv.sw->name);

drivers/net/mtk_eth/mt753x.h +2 -0
index 65046a1421c..cd128ad39fe 100644
@@ -14,6 +14,8 @@
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
 
+#include "../mdio-mt7531.h"
+
 struct mtk_eth_priv;
 
 #define MT753X_NUM_PHYS              5
@@ -254,6 +256,7 @@ struct mtk_eth_priv;
 
Quoted 12 lines
Quoted 10 lines
Quoted 9 lines
drivers/net/mtk_eth/mt753x.h +1 -1
 struct mt753x_switch_priv {
      struct mtk_eth_switch_priv epriv;
+     struct mt7531_mdio_priv mdio_priv;
      struct mii_dev *mdio_bus;
      u32 smi_addr;
      u32 phy_base;
--

2.50.0

Quoted 2 lines

--
Ansuel

--
Ansuel

#6 lore raw

RFC PATCH 2/5 net: airoha: bind MDIO controller on Ethernet load

In reply to Christian Marangi

Bind MDIO controller on Ethernet Controller load. The Airoha AN7581 SoC have an integrated Switch based on MT7531 (or more saying MT7988).

Attach it to the switch node to support scanning for MDIO devices on the BUS.

---
 drivers/net/Kconfig      |  1 +
 drivers/net/airoha_eth.c | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
drivers/net/Kconfig +1 -0
index 9ac9bee46c9..f7ea12f9b37 100644
@@ -126,6 +126,7 @@ config AIROHA_ETH
 	depends on ARCH_AIROHA
 	select PHYLIB
 	select DM_RESET
+	select MDIO_MT7531
 	help
 	  This Driver support Airoha Ethernet QDMA Driver
 	  Say Y to enable support for the Airoha Ethernet QDMA.
drivers/net/airoha_eth.c +26 -0
index 6588eb3a806..6be6ec2845b 100644
@@ -971,6 +971,31 @@ static int arht_eth_write_hwaddr(struct udevice *dev)
 	return 0;
 }
 
+static int airoha_eth_bind(struct udevice *dev)
+{
+	struct airoha_eth_soc_data *data = (void *)dev_get_driver_data(dev);
+	struct udevice *mdio_dev;
+	ofnode switch_node;
+	int ret = 0;
+
+	if (!CONFIG_IS_ENABLED(MDIO_MT7531))
+		return 0;
+
+	switch_node = ofnode_by_compatible(ofnode_null(),
+					   "airoha,en7581-switch");
+	if (!ofnode_valid(switch_node)) {
+		debug("Warning: missing switch node\n");
+		return 0;
+	}
+
+	ret = device_bind_driver_to_node(dev, "mt7531-mdio", "mdio",
+					 switch_node, &mdio_dev);
+	if (ret)
+		debug("Warning: failed to bind mdio controller\n");
+
+	return 0;
+}
+
 static const struct udevice_id airoha_eth_ids[] = {
 	{ .compatible = "airoha,en7581-eth" },
 	{ }
@@ -990,6 +1015,7 @@ U_BOOT_DRIVER(airoha_eth) = {
 	.id = UCLASS_ETH,
 	.of_match = airoha_eth_ids,
 	.probe = airoha_eth_probe,
+	.bind = airoha_eth_bind,
 	.ops = &airoha_eth_ops,
 	.priv_auto = sizeof(struct airoha_eth),
 	.plat_auto = sizeof(struct eth_pdata),
Signature · 1 line
2.50.0
#7 lore raw

RFC PATCH 3/5 net: airoha: add support for Airoha PCS driver

In reply to Christian Marangi

Add support for Airoha PCS driver present on AN7581 SoC. This is needed to configure the Serdes port for the different PHY mode.

---
 drivers/net/Kconfig                    |    2 +
 drivers/net/Makefile                   |    1 +
 drivers/net/airoha/Kconfig             |   12 +
 drivers/net/airoha/Makefile            |    6 +
 drivers/net/airoha/pcs-airoha-common.c |  803 ++++++++++++++
 drivers/net/airoha/pcs-airoha.h        | 1216 +++++++++++++++++++++
 drivers/net/airoha/pcs-an7581.c        | 1369 ++++++++++++++++++++++++
 7 files changed, 3409 insertions(+)
 create mode 100644 drivers/net/airoha/Kconfig
 create mode 100644 drivers/net/airoha/Makefile
 create mode 100644 drivers/net/airoha/pcs-airoha-common.c
 create mode 100644 drivers/net/airoha/pcs-airoha.h
 create mode 100644 drivers/net/airoha/pcs-an7581.c
drivers/net/Kconfig +2 -0
index f7ea12f9b37..f73dafa7d09 100644
@@ -121,6 +121,8 @@ config AG7XXX
 	  This driver supports the Atheros AG7xxx Ethernet MAC. This MAC is
 	  present in the Atheros AR7xxx, AR9xxx and QCA9xxx MIPS chips.
 
+source "drivers/net/airoha/Kconfig"
+
 config AIROHA_ETH
 	bool "Airoha Ethernet QDMA Driver"
 	depends on ARCH_AIROHA
drivers/net/Makefile +1 -0
index beb7864adc2..4bc51be4e0a 100644
@@ -5,6 +5,7 @@
 
 
 obj-$(CONFIG_AG7XXX) += ag7xxx.o
+obj-y += airoha/
 obj-$(CONFIG_AIROHA_ETH) += airoha_eth.o
 obj-$(CONFIG_ALTERA_TSE) += altera_tse.o
 obj-$(CONFIG_ASPEED_MDIO) += aspeed_mdio.o
drivers/net/airoha/Kconfig new file +12 -0
new file mode 100644
index 00000000000..8c2d6db92fa
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config PCS_AIROHA
+	bool
+	select MISC
+
+config PCS_AIROHA_AN7581
+	bool "Airoha AN7581 PCS driver"
+	select PCS_AIROHA
+	help
+	  This module provides helper to phylink for managing the Airoha
+	  AN7581 PCS for SoC Ethernet and PON SERDES.
drivers/net/airoha/Makefile new file +6 -0
new file mode 100644
index 00000000000..27f2969434c
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y				+= pcs-airoha-common.o
+ifdef CONFIG_PCS_AIROHA_AN7581
+obj-y				+= pcs-an7581.o
+endif
drivers/net/airoha/pcs-airoha-common.c new file +803 -0

803 lines not on this page · raw message

drivers/net/airoha/pcs-airoha.h new file +1216 -0

1,216 lines not on this page · raw message

drivers/net/airoha/pcs-an7581.c new file +1369 -0

948 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.50.0

Part of the diff is not shown here. View the raw message.

#8 lore raw

RFC PATCH 4/5 net: airoha: fill in support for PCS in Airoha Ethernet driver

In reply to Christian Marangi

Add required changes to call PCS function to configure the Serdes Port. The Ethernet driver is adapted following Upstream Kernel node structure.

Function calling order is the same of Phylink upstream kernel.

---
 drivers/net/Kconfig      |  1 +
 drivers/net/airoha_eth.c | 89 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
drivers/net/Kconfig +1 -0
index f73dafa7d09..e0e426204ce 100644
@@ -129,6 +129,7 @@ config AIROHA_ETH
 	select PHYLIB
 	select DM_RESET
 	select MDIO_MT7531
+	select PCS_AIROHA_AN7581
 	help
 	  This Driver support Airoha Ethernet QDMA Driver
 	  Say Y to enable support for the Airoha Ethernet QDMA.
drivers/net/airoha_eth.c +89 -0

120 lines not on this page · raw message

Signature · 1 line
2.50.0
#9 lore raw

RFC PATCH 5/5 airoha: add PCS node for AN7581

In reply to Christian Marangi

Add PCS node for Airoha AN7581 SoC to enable support for Serdes Ethernet and PON port.

---
 arch/arm/dts/an7581-u-boot.dtsi     | 71 +++++++++++++++++++++++++++++
 arch/arm/dts/en7581-evb-u-boot.dtsi | 18 ++++++++
 2 files changed, 89 insertions(+)
arch/arm/dts/an7581-u-boot.dtsi +71 -0
index a9297ca6503..9ee0f808660 100644
@@ -35,6 +35,48 @@
 			reg = <0x0 0x1fa20000 0x0 0x388>;
 		};
 
+		pon_pcs: pcs@1fa08000 {
+			compatible = "airoha,an7581-pcs-pon";
+			reg = <0x0 0x1fa08000 0x0 0x1000>,
+			      <0x0 0x1fa80000 0x0 0x60>,
+			      <0x0 0x1fa80a00 0x0 0x164>,
+			      <0x0 0x1fa84000 0x0 0x450>,
+			      <0x0 0x1fa85900 0x0 0x338>,
+			      <0x0 0x1fa86000 0x0 0x300>,
+			      <0x0 0x1fa8a000 0x0 0x1000>,
+			      <0x0 0x1fa8b000 0x0 0x1000>;
+			reg-names = "xfi_mac", "hsgmii_an", "hsgmii_pcs",
+				    "multi_sgmii", "usxgmii",
+				    "hsgmii_rate_adp", "xfi_ana", "xfi_pma";
+
+			resets = <&scuclk EN7581_XPON_MAC_RST>,
+				 <&scuclk EN7581_XPON_PHY_RST>;
+			reset-names = "mac", "phy";
+
+			airoha,scu = <&scuclk>;
+		};
+
+		eth_pcs: pcs@1fa09000 {
+			compatible = "airoha,an7581-pcs-eth";
+			reg = <0x0 0x1fa09000 0x0 0x1000>,
+			      <0x0 0x1fa70000 0x0 0x60>,
+			      <0x0 0x1fa70a00 0x0 0x164>,
+			      <0x0 0x1fa74000 0x0 0x450>,
+			      <0x0 0x1fa75900 0x0 0x338>,
+			      <0x0 0x1fa76000 0x0 0x300>,
+			      <0x0 0x1fa7a000 0x0 0x1000>,
+			      <0x0 0x1fa7b000 0x0 0x1000>;
+			reg-names = "xfi_mac", "hsgmii_an", "hsgmii_pcs",
+				    "multi_sgmii", "usxgmii",
+				    "hsgmii_rate_adp", "xfi_ana", "xfi_pma";
+
+			resets = <&scuclk EN7581_XSI_MAC_RST>,
+				 <&scuclk EN7581_XSI_PHY_RST>;
+			reset-names = "mac", "phy";
+
+			airoha,scu = <&scuclk>;
+		};
+
 		eth: ethernet@1fb50000 {
 			compatible = "airoha,en7581-eth";
 			reg = <0 0x1fb50000 0 0x2600>,
@@ -52,6 +94,35 @@
 			reset-names = "fe", "pdma", "qdma",
 				      "hsi0-mac", "hsi1-mac", "hsi-mac",
 				      "xfp-mac";
+
+			gdm1: ethernet@1 {
+				compatible = "airoha,eth-mac";
+				reg = <1>;
+				phy-mode = "internal";
+				status = "disabled";
+
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+					pause;
+				};
+			};
+
+			gdm2: ethernet@2 {
+				compatible = "airoha,eth-mac";
+				reg = <2>;
+				pcs = <&pon_pcs>;
+
+				status = "disabled";
+			};
+
+			gdm4: ethernet@4 {
+				compatible = "airoha,eth-mac";
+				reg = <4>;
+				pcs = <&eth_pcs>;
+
+				status = "disabled";
+			};
 		};
 
 		switch: switch@1fb58000 {
arch/arm/dts/en7581-evb-u-boot.dtsi +18 -0
index ebd3b8b4958..6b084e3defe 100644
@@ -9,3 +9,21 @@
 };
 
 #include "an7581-u-boot.dtsi"
+
+&gdm1 {
+	status = "okay";
+};
+
+&gdm2 {
+	// status = "okay";
+
+	managed = "in-band-status";
+	phy-mode = "10gbase-r";
+};
+
+&gdm4 {
+	status = "okay";
+
+	managed = "in-band-status";
+	phy-mode = "usxgmii";
+};
Signature · 1 line
2.50.0