phy: add phy_find_by_mask/phy_connect_dev

It is useful to be able to try a range of
possible phy addresses to connect.

Also, an ethernet device is not required
to use phy_find_by_mask leading to better
separation of mii vs ethernet, as suggested
by Andy Fleming.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1ffa791dceb357d2e813880732fe3350a3cbc021..d0ed7666ed98cbeccee364b38dc31f77cd6ce0d5 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -31,6 +31,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <linux/err.h>
 
 /* Generic PHY support and helper functions */
 
@@ -574,6 +575,61 @@ static int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
        return 0;
 }
 
+static struct phy_device *create_phy_by_mask(struct mii_dev *bus,
+               unsigned phy_mask, int devad, phy_interface_t interface)
+{
+       u32 phy_id = 0xffffffff;
+       while (phy_mask) {
+               int addr = ffs(phy_mask) - 1;
+               int r = get_phy_id(bus, addr, devad, &phy_id);
+               if (r < 0)
+                       return ERR_PTR(r);
+               /* If the PHY ID is mostly f's, we didn't find anything */
+               if ((phy_id & 0x1fffffff) != 0x1fffffff)
+                       return phy_device_create(bus, addr, phy_id, interface);
+               phy_mask &= ~(1 << addr);
+       }
+       return NULL;
+}
+
+static struct phy_device *search_for_existing_phy(struct mii_dev *bus,
+               unsigned phy_mask, phy_interface_t interface)
+{
+       /* If we have one, return the existing device, with new interface */
+       while (phy_mask) {
+               int addr = ffs(phy_mask) - 1;
+               if (bus->phymap[addr]) {
+                       bus->phymap[addr]->interface = interface;
+                       return bus->phymap[addr];
+               }
+               phy_mask &= ~(1 << addr);
+       }
+       return NULL;
+}
+
+static struct phy_device *get_phy_device_by_mask(struct mii_dev *bus,
+               unsigned phy_mask, phy_interface_t interface)
+{
+       int i;
+       struct phy_device *phydev;
+
+       phydev = search_for_existing_phy(bus, phy_mask, interface);
+       if (phydev)
+               return phydev;
+       /* Try Standard (ie Clause 22) access */
+       /* Otherwise we have to try Clause 45 */
+       for (i = 0; i < 5; i++) {
+               phydev = create_phy_by_mask(bus, phy_mask,
+                               i ? i : MDIO_DEVAD_NONE, interface);
+               if (IS_ERR(phydev))
+                       return NULL;
+               if (phydev)
+                       return phydev;
+       }
+       printf("Phy not found\n");
+       return phy_device_create(bus, ffs(phy_mask) - 1, 0xffffffff, interface);
+}
+
 /**
  * get_phy_device - reads the specified PHY device and returns its @phy_device struct
  * @bus: the target MII bus
@@ -585,38 +641,7 @@ static int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
 static struct phy_device *get_phy_device(struct mii_dev *bus, int addr,
                                         phy_interface_t interface)
 {
-       u32 phy_id = 0x1fffffff;
-       int i;
-       int r;
-
-       /* If we have one, return the existing device, with new interface */
-       if (bus->phymap[addr]) {
-               bus->phymap[addr]->interface = interface;
-
-               return bus->phymap[addr];
-       }
-
-       /* Try Standard (ie Clause 22) access */
-       r = get_phy_id(bus, addr, MDIO_DEVAD_NONE, &phy_id);
-       if (r)
-               return NULL;
-
-       /* If the PHY ID is mostly f's, we didn't find anything */
-       if ((phy_id & 0x1fffffff) != 0x1fffffff)
-               return phy_device_create(bus, addr, phy_id, interface);
-
-       /* Otherwise we have to try Clause 45 */
-       for (i = 1; i < 5; i++) {
-               r = get_phy_id(bus, addr, i, &phy_id);
-               if (r)
-                       return NULL;
-
-               /* If the phy_id is mostly Fs, there is no device there */
-               if ((phy_id & 0x1fffffff) != 0x1fffffff)
-                       break;
-       }
-
-       return phy_device_create(bus, addr, phy_id, interface);
+       return get_phy_device_by_mask(bus, 1 << addr, interface);
 }
 
 int phy_reset(struct phy_device *phydev)
@@ -689,38 +714,41 @@ int miiphy_reset(const char *devname, unsigned char addr)
        return phy_reset(phydev);
 }
 
-struct phy_device *phy_connect(struct mii_dev *bus, int addr,
-                               struct eth_device *dev,
-                               phy_interface_t interface)
+struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
+               phy_interface_t interface)
 {
-       struct phy_device *phydev;
-
        /* Reset the bus */
        if (bus->reset)
                bus->reset(bus);
 
        /* Wait 15ms to make sure the PHY has come out of hard reset */
        udelay(15000);
+       return get_phy_device_by_mask(bus, phy_mask, interface);
+}
 
-       phydev = get_phy_device(bus, addr, interface);
-
-       if (!phydev) {
-               printf("Could not get PHY for %s:%d\n", bus->name, addr);
-
-               return NULL;
-       }
-
+void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev)
+{
        /* Soft Reset the PHY */
        phy_reset(phydev);
-
-       if (phydev->dev)
+       if (phydev->dev) {
                printf("%s:%d is connected to %s.  Reconnecting to %s\n",
-                       bus->name, addr, phydev->dev->name, dev->name);
-
+                               phydev->bus->name, phydev->addr,
+                               phydev->dev->name, dev->name);
+       }
        phydev->dev = dev;
-
        debug("%s connected to %s\n", dev->name, phydev->drv->name);
+}
+
+struct phy_device *phy_connect(struct mii_dev *bus, int addr,
+               struct eth_device *dev, phy_interface_t interface)
+{
+       struct phy_device *phydev;
 
+       phydev = phy_find_by_mask(bus, 1 << addr, interface);
+       if (phydev)
+               phy_connect_dev(phydev, dev);
+       else
+               printf("Could not get PHY for %s: addr %d\n", bus->name, addr);
        return phydev;
 }
 

diff --git a/include/phy.h b/include/phy.h
index 3c30f115b6e02c32c71f51c749072b6a363f9280..58ca2730c84eac4419b384954f3f8b2c50a503cf 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -199,6 +199,9 @@ static inline int is_10g_interface(phy_interface_t interface)
 
 int phy_init(void);
 int phy_reset(struct phy_device *phydev);
+struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
+               phy_interface_t interface);
+void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev);
 struct phy_device *phy_connect(struct mii_dev *bus, int addr,
                                struct eth_device *dev,
                                phy_interface_t interface);