[PATCH 0/1] net: stmmac: Don't search for phys if mdio node is defined.

If a dt mdio entry has been added least assume that we wont
search for phys attached. The DT and of_mdiobus_register already do
this. This stops DSA phys being found and phys created for them, as
this is handled by the DSA driver.

Note: I'm not 100% sure that priv->plat->phy_node should be included
in the conditional here. But it looks like if a phy-handle is used
then we don't want to search for phys.

Phil Reid (1):
  net: stmmac: Don't search for phys if mdio node is defined.

 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 ++++
 1 file changed, 4 insertions(+)

-- 
1.8.3.1

If a dt mdio entry has been added least assume that we wont
search for phys attached. The DT and of_mdiobus_register already do
this. This stops DSA phys being found and phys created for them, as
this is handled by the DSA driver.

Signed-off-by: Phil Reid <redacted>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 3f5512f..06704ca 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

@@ -235,6 +235,9 @@ int stmmac_mdio_register(struct net_device *ndev)
 		goto bus_register_fail;
 	}
 
+	if (priv->plat->phy_node || mdio_node)
+		goto bus_register_done;
+
 	found = 0;
 	for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
 		struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);

@@ -290,6 +293,7 @@ int stmmac_mdio_register(struct net_device *ndev)
 		return -ENODEV;
 	}
 
+bus_register_done:
 	priv->mii = new_bus;
 
 	return 0;

-- 
1.8.3.1

On 3/15/2016 8:34 AM, Phil Reid wrote:

If a dt mdio entry has been added least assume that we wont
search for phys attached. The DT and of_mdiobus_register already do
this. This stops DSA phys being found and phys created for them, as
this is handled by the DSA driver.

iiuc, this doesn't conflict with the recent rework we are doing
for the mdio/phy platform management.

Signed-off-by: Phil Reid <redacted>

Acked-by: Giuseppe Cavallaro <redacted>

On 16/03/2016 5:36 PM, Giuseppe CAVALLARO wrote:

On 3/15/2016 8:34 AM, Phil Reid wrote:

quoted

If a dt mdio entry has been added least assume that we wont
search for phys attached. The DT and of_mdiobus_register already do
this. This stops DSA phys being found and phys created for them, as
this is handled by the DSA driver.

iiuc, this doesn't conflict with the recent rework we are doing
for the mdio/phy platform management.

It should apply equally well before or after the rework.

quoted

Signed-off-by: Phil Reid <redacted>

Acked-by: Giuseppe Cavallaro <redacted>

quoted

---
  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 3f5512f..06704ca 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

@@ -235,6 +235,9 @@ int stmmac_mdio_register(struct net_device *ndev)
          goto bus_register_fail;
      }

+    if (priv->plat->phy_node || mdio_node)
+        goto bus_register_done;
+
      found = 0;
      for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
          struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);

@@ -290,6 +293,7 @@ int stmmac_mdio_register(struct net_device *ndev)
          return -ENODEV;
      }

+bus_register_done:
      priv->mii = new_bus;

      return 0;

-- 
Regards
Phil Reid

ElectroMagnetic Imaging Technology Pty Ltd
Development of Geophysical Instrumentation & Software
www.electromag.com.au

3 The Avenue, Midland WA 6056, AUSTRALIA
Ph: +61 8 9250 8100
Fax: +61 8 9250 7100
Email: preid@electromag.com.au

From: Phil Reid <redacted>
Date: Tue, 15 Mar 2016 15:34:33 +0800

If a dt mdio entry has been added least assume that we wont
search for phys attached. The DT and of_mdiobus_register already do
this. This stops DSA phys being found and phys created for them, as
this is handled by the DSA driver.

Signed-off-by: Phil Reid <redacted>

Applied.