drivers: net: cpsw: Add reading of DT phy-handle node

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

---

v6 - Fix build error when DM_ETH is not defined and updated phy_handle error handling - https://patchwork.ozlabs.org/patch/608763/

 drivers/net/cpsw.c | 20 ++++++++++++++++++--
 include/cpsw.h     |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

drivers/net/cpsw.c +18 -2

index 7104754..3d6f0ce 100644
@@ -965,6 +965,11 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave)
 	phydev->supported &= supported;
 	phydev->advertising = phydev->supported;
 
+#ifdef CONFIG_DM_ETH
+	if (slave->data->phy_of_handle)
+		phydev->dev->of_offset = slave->data->phy_of_handle;
+#endif
+
 	priv->phydev = phydev;
 	phy_config(phydev);
 

@@ -1217,8 +1222,19 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
 			if (phy_mode)
 				priv->data.slave_data[slave_index].phy_if =
 					phy_get_interface_by_name(phy_mode);
-			fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
-			priv->data.slave_data[slave_index].phy_addr = phy_id[1];
+
+			priv->data.slave_data[slave_index].phy_of_handle =
+				fdtdec_lookup_phandle(fdt, subnode, "phy-handle");
+
+			if (priv->data.slave_data[slave_index].phy_of_handle >= 0) {
+				priv->data.slave_data[slave_index].phy_addr =
+					fdtdec_get_int(gd->fdt_blob,
+						priv->data.slave_data[slave_index].phy_of_handle,
+						"reg", -1);
+			} else {
+				fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
+				priv->data.slave_data[slave_index].phy_addr = phy_id[1];
+			}
 			slave_index++;
 		}
 

include/cpsw.h +1 -0

index cf1d30b..ff95cd8 100644
@@ -21,6 +21,7 @@ struct cpsw_slave_data {
 	u32		sliver_reg_ofs;
 	int		phy_addr;
 	int		phy_if;
+	int		phy_of_handle;
 };
 
 enum {

Add the ability to pass the phy-handle node offset to the phy driver. This allows the phy driver to access the DT subnode's data and parse accordingly.

Signed-off-by Dan Murphy <[email protected]>

Tested-by Michal Simek <[email protected]>

---

v6 - No changes - https://patchwork.ozlabs.org/patch/608769/

 drivers/net/zynq_gem.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

drivers/net/zynq_gem.c +10 -5

index aec8077..f9b22c4 100644
@@ -179,6 +179,7 @@ struct zynq_gem_priv {
 	struct zynq_gem_regs *iobase;
 	phy_interface_t interface;
 	struct phy_device *phydev;
+	int phy_of_handle;
 	struct mii_dev *bus;
 };
 

@@ -352,6 +353,10 @@ static int zynq_phy_init(struct udevice *dev)
 	priv->phydev->supported = supported | ADVERTISED_Pause |
 				  ADVERTISED_Asym_Pause;
 	priv->phydev->advertising = priv->phydev->supported;
+
+	if (priv->phy_of_handle > 0)
+		priv->phydev->dev->of_offset = priv->phy_of_handle;
+
 	phy_config(priv->phydev);
 
 	return 0;

@@ -675,7 +680,6 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_platdata(dev);
 	struct zynq_gem_priv *priv = dev_get_priv(dev);
-	int offset = 0;
 	const char *phy_mode;
 
 	pdata->iobase = (phys_addr_t)dev_get_addr(dev);

@@ -684,10 +688,11 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 	priv->emio = 0;
 	priv->phyaddr = -1;
 
-	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset,
-				       "phy-handle");
-	if (offset > 0)
-		priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1);
+	priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob,
+					dev->of_offset, "phy-handle");
+	if (priv->phy_of_handle > 0)
+		priv->phyaddr = fdtdec_get_int(gd->fdt_blob,
+					priv->phy_of_handle, "reg", -1);
 
 	phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL);
 	if (phy_mode)

Bump?

Quoted 13 lines · Dan Murphy

Add the ability to pass the phy-handle node offset to the phy driver. This allows the phy driver to access the DT subnode's data and parse accordingly.

Signed-off-by Dan Murphy <[email protected]>

Tested-by Michal Simek <[email protected]>

---

v6 - No changes - https://patchwork.ozlabs.org/patch/608769/

 drivers/net/zynq_gem.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Quoted 10 lines · Dan Murphy

Bump?

Quoted 8 lines · Dan Murphy

Add the ability to pass the phy-handle node offset to the phy driver. This allows the phy driver to access the DT subnode's data and parse accordingly.

Signed-off-by Dan Murphy <[email protected]>

Tested-by Michal Simek <[email protected]>

---

Quoted 4 lines

Quoted 4 lines

v6 - No changes - https://patchwork.ozlabs.org/patch/608769/

 drivers/net/zynq_gem.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Joe, Tom: Do you want to take this series?
I am happy to do so because there is xilinx part.

Quoted 13 lines · Michal Simek

Quoted 12 lines · Dan Murphy

Bump?

Quoted 10 lines · Dan Murphy

Add the ability to pass the phy-handle node offset to the phy driver. This allows the phy driver to access the DT subnode's data and parse accordingly.

Signed-off-by Dan Murphy <[email protected]>

Tested-by Michal Simek <[email protected]>

---

v6 - No changes - https://patchwork.ozlabs.org/patch/608769/

Quoted 6 lines

Quoted 2 lines

Quoted 2 lines

 drivers/net/zynq_gem.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Joe, Tom: Do you want to take this series?
I am happy to do so because there is xilinx part.

If Joe doesn't want to take it, I will.

Add the ability to pass the phy-handle node offset to the phy driver. This allows the phy driver to access the DT subnode's data and parse accordingly.

Signed-off-by Dan Murphy <[email protected]>

Tested-by Michal Simek <[email protected]>

Add the device tree bindings and the accompanying documentation for the TI DP83867 Giga bit ethernet phy driver.

The original document was from:

    [commit 2a10154abcb75ad0d7b6bfea6210ac743ec60897 from the Linux kernel]

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Add the device tree bindings and the accompanying documentation for the TI DP83867 Giga bit ethernet phy driver.

The original document was from:

    [commit 2a10154abcb75ad0d7b6bfea6210ac743ec60897 from the Linux kernel]

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Quoted 5 lines · Dan Murphy

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

Quoted 4 lines

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

Quoted 11 lines · Joe Hershberger

Quoted 9 lines · Dan Murphy

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

610950.mbox:140: WARNING: line over 80 characters 610950.mbox:153: WARNING: line over 80 characters 610950.mbox:154: WARNING: line over 80 characters 610950.mbox:165: WARNING: line over 80 characters
total: 0 errors, 4 warnings, 0 checks, 136 lines checked

Joe

Quoted 16 lines · Joe Hershberger

Quoted 11 lines · Joe Hershberger

Quoted 9 lines · Dan Murphy

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

Quoted 5 lines

610950.mbox:140: WARNING: line over 80 characters 610950.mbox:153: WARNING: line over 80 characters 610950.mbox:154: WARNING: line over 80 characters 610950.mbox:165: WARNING: line over 80 characters
total: 0 errors, 4 warnings, 0 checks, 136 lines checked

How do you want me to rebase these patches on the SGMII work from Michal on the ti.c or off of master? The patch I submitted was based off of the SGMII patchset.

Need to know how you want to handle this as I see the SGMII code is not in the base line yet.

Quoted 25 lines · Dan Murphy

Joe

Quoted 21 lines · Joe Hershberger

Quoted 11 lines · Joe Hershberger

Quoted 9 lines · Dan Murphy

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

610950.mbox:140: WARNING: line over 80 characters 610950.mbox:153: WARNING: line over 80 characters 610950.mbox:154: WARNING: line over 80 characters 610950.mbox:165: WARNING: line over 80 characters
total: 0 errors, 4 warnings, 0 checks, 136 lines checked

Quoted 2 lines

How do you want me to rebase these patches on the SGMII work from Michal on the ti.c or off of master? The patch I submitted was based off of the SGMII patchset.

I'm pulling in some of Michal's patches this release. Please reference which patches this depends on (patchwork links).

Hi Joe,

Quoted 25 lines · Joe Hershberger

Quoted 24 lines · Dan Murphy

Joe

Quoted 21 lines · Joe Hershberger

Quoted 11 lines · Joe Hershberger

Quoted 9 lines · Dan Murphy

Not all devices use the same internal delay or fifo depth. Add the ability to set the internal delay for rx or tx and the fifo depth via the devicetree. If the value is not set in the devicetree then set the delay to the default.

If devicetree is not used then use the default defines within the driver.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

610950.mbox:140: WARNING: line over 80 characters 610950.mbox:153: WARNING: line over 80 characters 610950.mbox:154: WARNING: line over 80 characters 610950.mbox:165: WARNING: line over 80 characters
total: 0 errors, 4 warnings, 0 checks, 136 lines checked

Quoted 4 lines

Quoted 2 lines

How do you want me to rebase these patches on the SGMII work from Michal on the ti.c or off of master? The patch I submitted was based off of the SGMII patchset.

I'm pulling in some of Michal's patches this release. Please reference which patches this depends on (patchwork links).

NOTE: A lot of my patches (maybe all of them) were already merged to mainline via Xilinx tree.

Cheers,
Michal

Move the phy_interface_is_rgmii to the phy.h file for all phy's to be able to use the API.

This now aligns with the Linux kernel based on commit e463d88c36d42211aa72ed76d32fb8bf37820ef1

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

Move the phy_interface_is_rgmii to the phy.h file for all phy's to be able to use the API.

This now aligns with the Linux kernel based on commit e463d88c36d42211aa72ed76d32fb8bf37820ef1

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

Add a helper to phy.h to identify whether the phy is configured for SGMII all variables.

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

Add a helper to phy.h to identify whether the phy is configured for SGMII all variables.

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

The code assumed that if the interface is not RGMII configured then it must be SGMII configured. This device has the ability to support most of the MII interfaces. Therefore add the helper for SGMII and only configure the device if the interface is configured for SGMII.

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

The code assumed that if the interface is not RGMII configured then it must be SGMII configured. This device has the ability to support most of the MII interfaces. Therefore add the helper for SGMII and only configure the device if the interface is configured for SGMII.

Signed-off-by Dan Murphy <[email protected]>

Reviewed-by Mugunthan V N <[email protected]>

Reviewed-by Michal Simek <[email protected]>

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

Quoted 3 lines · Dan Murphy

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

It would be great if the phy could be handled generically. Unfortunately there is no uniform description so far, so having each driver parse it is the best we can do for now.

Quoted 4 lines

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

Quoted 8 lines · Joe Hershberger

Quoted 3 lines · Dan Murphy

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

It would be great if the phy could be handled generically. Unfortunately there is no uniform description so far, so having each driver parse it is the best we can do for now.

Quoted 5 lines

Quoted 4 lines

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

610946.mbox:57: WARNING: line over 80 characters 610946.mbox:59: WARNING: line over 80 characters 610946.mbox:62: WARNING: line over 80 characters 610946.mbox:62: CHECK: Alignment should match open parenthesis 610946.mbox:65: WARNING: line over 80 characters 610946.mbox:66: WARNING: line over 80 characters
total: 0 errors, 5 warnings, 1 checks, 39 lines checked

Joe

Quoted 18 lines · Joe Hershberger

Quoted 8 lines · Joe Hershberger

Quoted 3 lines · Dan Murphy

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT.

It would be great if the phy could be handled generically. Unfortunately there is no uniform description so far, so having each driver parse it is the best we can do for now.

Quoted 5 lines

Quoted 4 lines

The phy-handle also needs to be stored and passed to the phy to access any phy data that is available.

Signed-off-by Dan Murphy <[email protected]>

Acked-by Joe Hershberger <[email protected]>

This patch is not checkpatch.pl clean. Please resubmit.

Quoted 7 lines

610946.mbox:57: WARNING: line over 80 characters 610946.mbox:59: WARNING: line over 80 characters 610946.mbox:62: WARNING: line over 80 characters 610946.mbox:62: CHECK: Alignment should match open parenthesis 610946.mbox:65: WARNING: line over 80 characters 610946.mbox:66: WARNING: line over 80 characters
total: 0 errors, 5 warnings, 1 checks, 39 lines checked

I can only fix a few there will still be at least 2 LTL warnings on this file and fixing it will break readability

I don't see how to fix this.

WARNING: line over 80 characters
#46: FILE: drivers/net/cpsw.c:1230:
+ if (priv->data.slave_data[slave_index].phy_of_handle >= 0) {

WARNING: line over 80 characters
#49: FILE: drivers/net/cpsw.c:1233:
+ priv->data.slave_data[slave_index].phy_of_handle,