mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH v2] net: phy: scan PHYs referenced by phandle
@ 2018-01-23 14:43 Lucas Stach
  2018-01-25  7:20 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2018-01-23 14:43 UTC (permalink / raw)
  To: barebox

If we point to a PHY node by phandle, that PHY might well be on a MDIO
bus that hasn't been scanned when we look for the PHY. Fortunately we
know exactly where to look for the PHY, so make sure to scan the bus
at the right address.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v2: Only enter MII bus loop when the address property was found.
---
 drivers/net/phy/phy.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 35a9ce7ea823..2b8fa63c0641 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -319,6 +319,8 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
 {
 	struct device_d *dev;
 	struct device_node *phy_node;
+	struct mii_bus *bus;
+	int addr;
 
 	if (!IS_ENABLED(CONFIG_OFDEVICE))
 		return NULL;
@@ -340,6 +342,16 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
 	if (!phy_node)
 		return NULL;
 
+	if (!of_property_read_u32(phy_node, "reg", &addr)) {
+		for_each_mii_bus(bus) {
+			if (bus->parent->device_node == phy_node->parent) {
+				struct phy_device *phy = mdiobus_scan(bus, addr);
+				if (!IS_ERR(phy))
+					return phy;
+			}
+		}
+	}
+
 	bus_for_each_device(&mdio_bus_type, dev) {
 		if (dev->device_node == phy_node)
 			return container_of(dev, struct phy_device, dev);
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] net: phy: scan PHYs referenced by phandle
  2018-01-23 14:43 [PATCH v2] net: phy: scan PHYs referenced by phandle Lucas Stach
@ 2018-01-25  7:20 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2018-01-25  7:20 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Tue, Jan 23, 2018 at 03:43:25PM +0100, Lucas Stach wrote:
> If we point to a PHY node by phandle, that PHY might well be on a MDIO
> bus that hasn't been scanned when we look for the PHY. Fortunately we
> know exactly where to look for the PHY, so make sure to scan the bus
> at the right address.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> v2: Only enter MII bus loop when the address property was found.
> ---
>  drivers/net/phy/phy.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 35a9ce7ea823..2b8fa63c0641 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -319,6 +319,8 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
>  {
>  	struct device_d *dev;
>  	struct device_node *phy_node;
> +	struct mii_bus *bus;
> +	int addr;
>  
>  	if (!IS_ENABLED(CONFIG_OFDEVICE))
>  		return NULL;
> @@ -340,6 +342,16 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
>  	if (!phy_node)
>  		return NULL;
>  
> +	if (!of_property_read_u32(phy_node, "reg", &addr)) {
> +		for_each_mii_bus(bus) {
> +			if (bus->parent->device_node == phy_node->parent) {
> +				struct phy_device *phy = mdiobus_scan(bus, addr);
> +				if (!IS_ERR(phy))
> +					return phy;
> +			}
> +		}
> +	}
> +
>  	bus_for_each_device(&mdio_bus_type, dev) {
>  		if (dev->device_node == phy_node)
>  			return container_of(dev, struct phy_device, dev);
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-25  7:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-23 14:43 [PATCH v2] net: phy: scan PHYs referenced by phandle Lucas Stach
2018-01-25  7:20 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox