net: introduce phylib

Adapt phylib from linux

switch all the driver to it
reimplement mii bus

This will allow to have
 - phy drivers
 - to only connect the phy at then opening of the device
 - if the phy is not ready or not up fail on open

Same behaviour as in linux and will allow to share code and simplify porting.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

4 files changed, 37 insertions, 48 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index b53dcc7c46..adb1b0b097 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -5,11 +5,11 @@ menuconfig NET_USB
 if NET_USB
 
 config NET_USB_ASIX
-	select MIIDEV
+	select PHYLIB
 	bool "Asix compatible"
 
 config NET_USB_SMSC95XX
-	select MIIDEV
+	select PHYLIB
 	bool "SMSC95xx"
 
 endif
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index be5a170d71..97680cfb54 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
-#include <miidev.h>
+#include <linux/phy.h>
 #include <usb/usb.h>
 #include <usb/usbnet.h>
 #include <errno.h>
@@ -231,10 +231,9 @@ static inline int asix_set_hw_mii(struct usbnet *dev)
 	return ret;
 }
 
-static int asix_mdio_read(struct mii_device *mdev, int phy_id, int loc)
+static int asix_mdio_read(struct mii_bus *bus, int phy_id, int loc)
 {
-	struct eth_device *eth = mdev->edev;
-	struct usbnet *dev = eth->priv;
+	struct usbnet *dev = bus->priv;
 	__le16 res;
 
 	asix_set_sw_mii(dev);
@@ -248,10 +247,9 @@ static int asix_mdio_read(struct mii_device *mdev, int phy_id, int loc)
 	return le16_to_cpu(res);
 }
 
-static int asix_mdio_write(struct mii_device *mdev, int phy_id, int loc, int val)
+static int asix_mdio_write(struct mii_bus *bus, int phy_id, int loc, u16 val)
 {
-	struct eth_device *eth = mdev->edev;
-	struct usbnet *dev = eth->priv;
+	struct usbnet *dev = bus->priv;
 	__le16 res = cpu_to_le16(val);
 
 	dev_dbg(&dev->edev.dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x",
@@ -469,14 +467,13 @@ static int asix_tx_fixup(struct usbnet *dev,
 
 static int asix_init_mii(struct usbnet *dev)
 {
-	dev->miidev.read = asix_mdio_read;
-	dev->miidev.write = asix_mdio_write;
-	dev->miidev.address = asix_get_phy_addr(dev);
-	dev->miidev.flags = 0;
-	dev->miidev.edev = &dev->edev;
-	dev->miidev.parent = &dev->udev->dev;
-
-	return mii_register(&dev->miidev);
+	dev->miibus.read = asix_mdio_read;
+	dev->miibus.write = asix_mdio_write;
+	dev->phy_addr = asix_get_phy_addr(dev);
+	dev->miibus.priv = dev;
+	dev->miibus.parent = &dev->udev->dev;
+
+	return mdiobus_register(&dev->miibus);
 }
 
 static int ax88172_link_reset(struct usbnet *dev)
@@ -631,7 +628,7 @@ out:
 
 static void asix_unbind(struct usbnet *dev)
 {
-	mii_unregister(&dev->miidev);
+	mdiobus_unregister(&dev->miibus);
 }
 
 static struct driver_info ax8817x_info = {
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index c21705eb80..11f2795fb9 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <errno.h>
-#include <miidev.h>
+#include <linux/phy.h>
 #include "smsc95xx.h"
 
 #define SMSC_CHIPNAME			"smsc95xx"
@@ -123,10 +123,9 @@ static int smsc95xx_phy_wait_not_busy(struct usbnet *dev)
 	return -EIO;
 }
 
-static int smsc95xx_mdio_read(struct mii_device *mdev, int phy_id, int idx)
+static int smsc95xx_mdio_read(struct mii_bus *bus, int phy_id, int idx)
 {
-	struct eth_device *eth = mdev->edev;
-	struct usbnet *dev = eth->priv;
+	struct usbnet *dev = bus->priv;
 	u32 val, addr;
 
 	/* confirm MII not busy */
@@ -149,11 +148,10 @@ static int smsc95xx_mdio_read(struct mii_device *mdev, int phy_id, int idx)
 	return val & 0xffff;
 }
 
-static int smsc95xx_mdio_write(struct mii_device *mdev, int phy_id, int idx,
-		int regval)
+static int smsc95xx_mdio_write(struct mii_bus *bus, int phy_id, int idx,
+		u16 regval)
 {
-	struct eth_device *eth = mdev->edev;
-	struct usbnet *dev = eth->priv;
+	struct usbnet *dev = bus->priv;
 	u32 val, addr;
 
 	/* confirm MII not busy */
@@ -439,20 +437,19 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
 	uint16_t val, bmcr;
 
 	/* Initialize MII structure */
-	dev->miidev.read = smsc95xx_mdio_read;
-	dev->miidev.write = smsc95xx_mdio_write;
-	dev->miidev.address = 1; /* FIXME: asix_get_phy_addr(dev); */
-	dev->miidev.flags = 0;
-	dev->miidev.edev = &dev->edev;
-	dev->miidev.parent = &dev->udev->dev;
-//	dev->miidev.name = dev->edev.name;
+	dev->miibus.read = smsc95xx_mdio_read;
+	dev->miibus.write = smsc95xx_mdio_write;
+	dev->phy_addr = 1; /* FIXME: asix_get_phy_addr(dev); */
+	dev->miibus.priv = dev;
+	dev->miibus.parent = &dev->udev->dev;
+//	dev->miibus.name = dev->edev.name;
 
 	/* reset phy and wait for reset to complete */
-	smsc95xx_mdio_write(&dev->miidev, phy_id, MII_BMCR, BMCR_RESET);
+	smsc95xx_mdio_write(&dev->miibus, phy_id, MII_BMCR, BMCR_RESET);
 
 	do {
 		udelay(10 * 1000);
-		bmcr = smsc95xx_mdio_read(&dev->miidev, phy_id, MII_BMCR);
+		bmcr = smsc95xx_mdio_read(&dev->miibus, phy_id, MII_BMCR);
 		timeout++;
 	} while ((bmcr & MII_BMCR) && (timeout < 100));
 
@@ -461,14 +458,14 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
 		return -EIO;
 	}
 
-	smsc95xx_mdio_write(&dev->miidev, phy_id, MII_ADVERTISE,
+	smsc95xx_mdio_write(&dev->miibus, phy_id, MII_ADVERTISE,
 		ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
 		ADVERTISE_PAUSE_ASYM);
 
 	/* read to clear */
-	val = smsc95xx_mdio_read(&dev->miidev, phy_id, PHY_INT_SRC);
+	val = smsc95xx_mdio_read(&dev->miibus, phy_id, PHY_INT_SRC);
 
-	smsc95xx_mdio_write(&dev->miidev, phy_id, PHY_INT_MASK,
+	smsc95xx_mdio_write(&dev->miibus, phy_id, PHY_INT_MASK,
 		PHY_INT_MASK_DEFAULT_);
 
 	netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
@@ -751,7 +748,7 @@ static int smsc95xx_bind(struct usbnet *dev)
 
 	dev->edev.get_ethaddr = smsc95xx_get_ethaddr;
 	dev->edev.set_ethaddr = smsc95xx_set_ethaddr;
-	mii_register(&dev->miidev);
+	mdiobus_register(&dev->miibus);
 
 	return 0;
 }
@@ -760,7 +757,7 @@ static void smsc95xx_unbind(struct usbnet *dev)
 {
 	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
 
-	mii_unregister(&dev->miidev);
+	mdiobus_unregister(&dev->miibus);
 
 	if (pdata) {
 		netif_dbg(dev, ifdown, dev->net, "free pdata\n");
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index c7e360690e..80b4ae7b9e 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -4,6 +4,7 @@
 #include <asm/byteorder.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/phy.h>
 
 static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
 {
@@ -160,8 +161,6 @@ static int usbnet_init(struct eth_device *edev)
                 return ret;
         }
 
-	miidev_restart_aneg(&dev->miidev);
-
 	return 0;
 }
 
@@ -171,12 +170,8 @@ static int usbnet_open(struct eth_device *edev)
 
 	dev_dbg(&edev->dev, "%s\n",__func__);
 
-	if (miidev_wait_aneg(&dev->miidev))
-		return -1;
-
-	miidev_print_status(&dev->miidev);
-
-	return 0;
+	return phy_device_connect(edev, &dev->miibus, dev->phy_addr, NULL,
+				0, PHY_INTERFACE_MODE_NA);
 }
 
 static void usbnet_halt(struct eth_device *edev)