Skip to contentSkip to conversation

net: ti: am65-cpsw-nuss: Drop custom properties

PATCH In review Roger Quadros 5 participants 11 messages Jul 22, 2023 – Jul 28, 2023

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

v2 cover net: ti: am65-cpsw-nuss: Drop custom properties

Hi,

This series gets rid of 2 custom properties (mac_efuse and cpsw-phy-sel) that were used in u-boot for the cpsw3g node.

This makes it easier for us to have u-boot DT in sync with Linux.

Last 2 patches are RFC so they can come separately. i.e. squashed with DT cleanup series from Nishanth.

cheers,
-roger

Changelog:
v2:
- drop enabling CONFIG_SYSCON from defconfig. Use imply in Kconfig instead.
- add patch to drop cpsw-phy-sel custom DT property.

Roger Quadros (4):
net: ti: am65-cpsw-nuss: Use approved property to get efuse address
net: ti: am65-cpsw-nuss: Get port mode register from standard "phys"
property
arm: dts: k3-am625-sk-u-boot.dtsi: drop mac_efuse
arm: dts: k3-am625-sk-u-boot.dtsi: drop cpsw-phy-sel property

 arch/arm/dts/k3-am625-sk-u-boot.dtsi |  10 ---
 drivers/net/ti/Kconfig               |   1 +
 drivers/net/ti/am65-cpsw-nuss.c      | 115 +++++++++++++++++----------
 3 files changed, 74 insertions(+), 52 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/4 net: ti: am65-cpsw-nuss: Use approved property to get efuse address

The approved DT property for MAC efuse (ROM) address is "ti,syscon-efuse".

Use that and drop custom property "mac_efuse".

---
 drivers/net/ti/Kconfig          |  1 +
 drivers/net/ti/am65-cpsw-nuss.c | 52 +++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 16 deletions(-)
drivers/net/ti/Kconfig +1 -0
index e13dbc9401..d9f1c019a8 100644
@@ -43,6 +43,7 @@ config TI_AM65_CPSW_NUSS
 	depends on ARCH_K3
 	imply MISC_INIT_R
 	imply MISC
+	imply SYSCON
 	select PHYLIB
 	help
 	  This driver supports TI K3 MCU CPSW Nuss Ethernet controller
drivers/net/ti/am65-cpsw-nuss.c +36 -16

82 lines not on this page · raw message

Signature · 1 line
2.34.1
Acked-by on v2 1/4
#2 lore raw

Re: [PATCH v2 1/4] net: ti: am65-cpsw-nuss: Use approved property to get efuse address

Quoted 6 lines · Roger Quadros

The approved DT property for MAC efuse (ROM) address is "ti,syscon-efuse".

Use that and drop custom property "mac_efuse".

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#4 lore raw

PATCH v2 2/4 net: ti: am65-cpsw-nuss: Get port mode register from standard "phys" property

In reply to Roger Quadros

Approved DT binding has the port mode register in the "phys" property. Get it from there instead of the custom "cpsw-phy-sel" property.

This will allow us to keep DT in sync with Linux.

---
 drivers/net/ti/am65-cpsw-nuss.c | 63 +++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 26 deletions(-)
drivers/net/ti/am65-cpsw-nuss.c +37 -26
index ee46676ec8..ce52106e52 100644
@@ -102,7 +102,6 @@ struct am65_cpsw_common {
 	fdt_addr_t		cpsw_base;
 	fdt_addr_t		mdio_base;
 	fdt_addr_t		ale_base;
-	fdt_addr_t		gmii_sel;
 
 	struct clk		fclk;
 	struct power_domain	pwrdmn;
@@ -232,18 +231,37 @@ out:
 
 #define AM65_GMII_SEL_RGMII_IDMODE	BIT(4)
 
-static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv,
-				  phy_interface_t phy_mode, int slave)
+static int am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv,
+				 phy_interface_t phy_mode)
 {
-	struct am65_cpsw_common	*common = priv->cpsw_common;
-	fdt_addr_t gmii_sel = common->gmii_sel + AM65_GMII_SEL_PORT_OFFS(slave);
-	u32 reg;
-	u32 mode = 0;
+	struct udevice *dev = priv->dev;
+	u32 offset, reg, phandle;
 	bool rgmii_id = false;
+	fdt_addr_t gmii_sel;
+	u32 mode = 0;
+	ofnode node;
+	int ret;
+
+	ret = ofnode_read_u32(dev_ofnode(dev), "phys", &phandle);
+	if (ret)
+		return ret;
+
+	ret = ofnode_read_u32_index(dev_ofnode(dev), "phys", 1, &offset);
+	if (ret)
+		return ret;
+
+	node = ofnode_get_by_phandle(phandle);
+	if (!ofnode_valid(node))
+		return -ENODEV;
+
+	gmii_sel = ofnode_get_addr(node);
+	if (gmii_sel == FDT_ADDR_T_NONE)
+		return -ENODEV;
 
+	gmii_sel += AM65_GMII_SEL_PORT_OFFS(offset);
 	reg = readl(gmii_sel);
 
-	dev_dbg(common->dev, "old gmii_sel: %08x\n", reg);
+	dev_dbg(dev, "old gmii_sel: %08x\n", reg);
 
 	switch (phy_mode) {
 	case PHY_INTERFACE_MODE_RMII:
@@ -262,7 +280,7 @@ static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv,
 		break;
 
 	default:
-		dev_warn(common->dev,
+		dev_warn(dev,
 			 "Unsupported PHY mode: %u. Defaulting to MII.\n",
 			 phy_mode);
 		/* fallthrough */
@@ -275,15 +293,19 @@ static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv,
 		mode |= AM65_GMII_SEL_RGMII_IDMODE;
 
 	reg = mode;
-	dev_dbg(common->dev, "gmii_sel PHY mode: %u, new gmii_sel: %08x\n",
+	dev_dbg(dev, "gmii_sel PHY mode: %u, new gmii_sel: %08x\n",
 		phy_mode, reg);
 	writel(reg, gmii_sel);
 
 	reg = readl(gmii_sel);
-	if (reg != mode)
-		dev_err(common->dev,
+	if (reg != mode) {
+		dev_err(dev,
 			"gmii_sel PHY mode NOT SET!: requested: %08x, gmii_sel: %08x\n",
 			mode, reg);
+		return 0;
+	}
+
+	return 0;
 }
 
 static int am65_cpsw_start(struct udevice *dev)
@@ -708,7 +730,9 @@ static int am65_cpsw_port_probe(struct udevice *dev)
 	if (ret)
 		goto out;
 
-	am65_cpsw_gmii_sel_k3(priv, pdata->phy_interface, priv->port_id);
+	ret = am65_cpsw_gmii_sel_k3(priv, pdata->phy_interface);
+	if (ret)
+		goto out;
 
 	ret = am65_cpsw_mdio_init(dev);
 	if (ret)
@@ -803,19 +827,6 @@ static int am65_cpsw_probe_nuss(struct udevice *dev)
 				   AM65_CPSW_CPSW_NU_PORT_MACSL_OFFSET;
 	}
 
-	node = dev_read_subnode(dev, "cpsw-phy-sel");
-	if (!ofnode_valid(node)) {
-		dev_err(dev, "can't find cpsw-phy-sel\n");
-		ret = -ENOENT;
-		goto out;
-	}
-
-	cpsw_common->gmii_sel = ofnode_get_addr(node);
-	if (cpsw_common->gmii_sel == FDT_ADDR_T_NONE) {
-		dev_err(dev, "failed to get gmii_sel base\n");
-		goto out;
-	}
-
 	cpsw_common->bus_freq =
 			dev_read_u32_default(dev, "bus_freq",
 					     AM65_CPSW_MDIO_BUS_FREQ_DEF);
Signature · 1 line
2.34.1
Acked-by on v2 2/4
#5 lore raw

Re: [PATCH v2 2/4] net: ti: am65-cpsw-nuss: Get port mode register from standard "phys" property

Quoted 8 lines · Roger Quadros

Approved DT binding has the port mode register in the "phys" property. Get it from there instead of the custom "cpsw-phy-sel" property.

This will allow us to keep DT in sync with Linux.

---

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#6 lore raw

Re: [PATCH v2 2/4] net: ti: am65-cpsw-nuss: Get port mode register from standard "phys" property

In reply to Roger Quadros
Quoted 8 lines · Roger Quadros

Approved DT binding has the port mode register in the "phys" property. Get it from there instead of the custom "cpsw-phy-sel" property.

This will allow us to keep DT in sync with Linux.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#7 lore raw

RFC PATCH v2 3/4 arm: dts: k3-am625-sk-u-boot.dtsi: drop mac_efuse

In reply to Roger Quadros

This was a custom property and we don't need it anymore. We are now using the standard property "ti,syscon-efuse".

---
 arch/arm/dts/k3-am625-sk-u-boot.dtsi | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/dts/k3-am625-sk-u-boot.dtsi +0 -3
index 249155733a..54fdabdb8e 100644
@@ -128,9 +128,6 @@
 };
 
 &cpsw3g {
-	reg = <0x0 0x8000000 0x0 0x200000>,
-	      <0x0 0x43000200 0x0 0x8>;
-	reg-names = "cpsw_nuss", "mac_efuse";
 	/delete-property/ ranges;
 	bootph-pre-ram;
 
Signature · 1 line
2.34.1
#8 lore raw

RFC PATCH v2 4/4 arm: dts: k3-am625-sk-u-boot.dtsi: drop cpsw-phy-sel property

In reply to Roger Quadros

This was a custom property and we don't need it anymore. We are now using the standard property "phys" to get the PHY port control register.

---
 arch/arm/dts/k3-am625-sk-u-boot.dtsi | 7 -------
 1 file changed, 7 deletions(-)
arch/arm/dts/k3-am625-sk-u-boot.dtsi +0 -7
index 54fdabdb8e..d33c2fca3d 100644
@@ -128,14 +128,7 @@
 };
 
 &cpsw3g {
-	/delete-property/ ranges;
 	bootph-pre-ram;
-
-	cpsw-phy-sel@04044 {
-		compatible = "ti,am64-phy-gmii-sel";
-		reg = <0x0 0x00104044 0x0 0x8>;
-		bootph-pre-ram;
-	};
 };
 
 &cpsw_port1 {
Signature · 1 line
2.34.1
Tested-by on the v2 series
#9 lore raw
In reply to Roger Quadros

Hi,

Quoted 7 lines · Roger Quadros

This series gets rid of 2 custom properties (mac_efuse and cpsw-phy-sel) that were used in u-boot for the cpsw3g node.

This makes it easier for us to have u-boot DT in sync with Linux.

Last 2 patches are RFC so they can come separately. i.e. squashed with DT cleanup series from Nishanth.

Thanks for cleaning this up, hopefully it will solve our ranges conversation :)

Maxime

Tested-by on the v2 series
#10 lore raw
In reply to Roger Quadros

Hi Roger

Quoted 25 lines · Roger Quadros

Hi,

This series gets rid of 2 custom properties (mac_efuse and cpsw-phy-sel) that were used in u-boot for the cpsw3g node.

This makes it easier for us to have u-boot DT in sync with Linux.

Last 2 patches are RFC so they can come separately. i.e. squashed with DT cleanup series from Nishanth.

cheers,
-roger

Changelog:
v2:
- drop enabling CONFIG_SYSCON from defconfig. Use imply in Kconfig instead.
- add patch to drop cpsw-phy-sel custom DT property.

Roger Quadros (4):
  net: ti: am65-cpsw-nuss: Use approved property to get efuse address
  net: ti: am65-cpsw-nuss: Get port mode register from standard "phys" property
  arm: dts: k3-am625-sk-u-boot.dtsi: drop mac_efuse
  arm: dts: k3-am625-sk-u-boot.dtsi: drop cpsw-phy-sel property

Quoted 4 lines

 arch/arm/dts/k3-am625-sk-u-boot.dtsi |  10 --- drivers/net/ti/Kconfig               |   1 + drivers/net/ti/am65-cpsw-nuss.c      | 115 +++++++++++++++++----------

 3 files changed, 74 insertions(+), 52 deletions(-)

This also works with our in-flight stuff [1] with the same adjustments which we will shortly send as a v4.

[1] https://lore.kernel.org/all/[email protected]

Cheers

Marcel