net: cpsw: fix probe with fixed-link
PATCH 1/1 net: cpsw: fix probe with fixed-link
If cpsw slave is set to fixed-link cpsw probe still try to probe and use a phy. This patch fix cpsw probe in case of fixed-link.
--- drivers/net/cpsw.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)
drivers/net/cpsw.c +27 -14
@@ -184,6 +184,7 @@ struct cpsw_slave {struct eth_device edev;struct cpsw_priv *cpsw;struct device_d dev; +int fixed_link; };struct cpdma_desc {
@@ -913,18 +914,20 @@ static int cpsw_slave_setup(struct cpsw_slave *slave, int slave_num,struct eth_device *edev = &slave->edev;struct device_d *dev = &slave->dev;int ret; -struct phy_device *phy; +struct phy_device *phy =NULL ; - phy =mdiobus_scan (&priv->miibus, priv->slaves[slave_num].phy_id); -if (IS_ERR (phy)) { - ret =PTR_ERR (phy); - goto err_out; - } +if (!slave->fixed_link) { + phy =mdiobus_scan (&priv->miibus, priv->slaves[slave_num].phy_id); +if (IS_ERR (phy)) { + ret =PTR_ERR (phy); + goto err_out; + } - phy->dev.device_node = priv->slaves[slave_num].dev.device_node; - ret =phy_register_device (phy); -if (ret) - goto err_out; + phy->dev.device_node = priv->slaves[slave_num].dev.device_node; + ret =phy_register_device (phy); +if (ret) + goto err_out; + }sprintf (dev->name,"cpsw-slave" ); dev->id = slave->slave_num;
@@ -957,7 +960,8 @@ static int cpsw_slave_setup(struct cpsw_slave *slave, int slave_num,return 0 ; err_register_dev: -phy_unregister_device (phy); +if (!slave->fixed_link) +phy_unregister_device (phy); err_register_edev:unregister_device (dev); err_out:
@@ -1103,11 +1107,20 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)uint32_t phy_id[2 ]; ret =of_property_read_u32_array (child,"phy_id" , phy_id,2 ); -if (ret) -return ret; +if (!ret) { + slave->phy_id = phy_id[1 ]; + slave->fixed_link =0 ; + }else { +struct device_node *fl_np; + fl_np =of_find_node_by_name (child,"fixed-link" ); +if (fl_np) { + slave->phy_id =-1 ; + slave->fixed_link =1 ; + }else +return ret; + } slave->dev.device_node = child; - slave->phy_id = phy_id[1 ]; slave->phy_if =of_get_phy_mode (child); slave->slave_num = i;
Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Hi Andreas,
Quoted 28 lines · Andreas Schmidt
If cpsw slave is set to fixed-link cpsw probe still try to probe and use a phy. This patch fix cpsw probe in case of fixed-link.
Signed-off-by Andreas Schmidt <[email protected]>--- drivers/net/cpsw.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)drivers/net/cpsw.c +2
-2@@ -184,6 +184,7 @@ struct cpsw_slave {struct eth_device edev;struct cpsw_priv *cpsw;struct device_d dev; +int fixed_link; };struct cpdma_desc {@@ -913,18 +914,20 @@ static int cpsw_slave_setup(struct cpsw_slave *slave, int slave_num,struct eth_device *edev = &slave->edev;struct device_d *dev = &slave->dev;int ret; -struct phy_device *phy; +struct phy_device *phy =NULL ; - phy =mdiobus_scan (&priv->miibus, priv->slaves[slave_num].phy_id);
drivers/net/cpsw.c static int cpsw_slave_setup(struct cpsw_slave *slave, int slave_num, · line 924
Quoted 10 lines
drivers/net/cpsw.c +6
-4-if (IS_ERR (phy)) { - ret =PTR_ERR (phy); - goto err_out; - } +if (!slave->fixed_link) { + phy =mdiobus_scan (&priv->miibus, priv->slaves[slave_num].phy_id); +if (IS_ERR (phy)) { + ret =PTR_ERR (phy); + goto err_out; + }
Calling mdiobus_scan() here is not only wrong for a fixed phy, it is wrong for a regular mdiobus phy aswell. I just sent out a patch which just removes the call to mdiobus_scan(). Tested on a beaglebone which has a real phy, it should work for you aswell.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 1/1 net: cpsw: fix probe with fixed-link
While cpsw is probe dt, it accepts only slaves nodes with "phy_id" property. In case of fixed-link there are no "phy_id" property and probe would be failed. This patch avoid the failure due to missing "phy_id" in case of fixed-link.
---
Changes since v1:
- rework after "[PATCH] net: cpsw: remove unnecessary mdiobus_scan()" patch was committed.
--- drivers/net/cpsw.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/cpsw.c +6 -4
@@ -1089,11 +1089,13 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)if (i < priv->num_slaves && !strncmp (child->name,"slave" ,5 )) {struct cpsw_slave *slave = &priv->slaves[i]; -uint32_t phy_id[2 ]; +uint32_t phy_id[2 ] = {-1 ,-1 }; - ret =of_property_read_u32_array (child,"phy_id" , phy_id,2 ); -if (ret) -return ret; +if (!of_find_node_by_name (child,"fixed-link" )) { + ret =of_property_read_u32_array (child,"phy_id" , phy_id,2 ); +if (ret) +return ret; + } slave->dev.device_node = child; slave->phy_id = phy_id[1 ];
Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 5 lines · Andreas Schmidt
While cpsw is probe dt, it accepts only slaves nodes with "
phy_id" property. In case of fixed-link there are no "phy_id" property and probe would be failed. This patch avoid the failure due to missing "phy_id" in case of fixed-link.Signed-off-by Andreas Schmidt <[email protected]>
Quoted 8 lines
---
Changes since v1:
- rework after "[PATCH] net: cpsw: remove unnecessarymdiobus_scan()" patch was committed.--- drivers/net/cpsw.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Applied, thanks
Sascha
Quoted 32 lines
drivers/net/cpsw.c +6
-4@@ -1089,11 +1089,13 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)if (i < priv->num_slaves && !strncmp (child->name,"slave" ,5 )) {struct cpsw_slave *slave = &priv->slaves[i]; -uint32_t phy_id[2 ]; +uint32_t phy_id[2 ] = {-1 ,-1 }; - ret =of_property_read_u32_array (child,"phy_id" , phy_id,2 ); -if (ret) -return ret; +if (!of_find_node_by_name (child,"fixed-link" )) { + ret =of_property_read_u32_array (child,"phy_id" , phy_id,2 ); +if (ret) +return ret; + } slave->dev.device_node = child; slave->phy_id = phy_id[1 ];Signature · 7 lines
2.14.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox