[U-Boot] [PATCH 07/07] Coldfire: mcfmii: Allow non-autonegotiating PHYs to use mii command.

[U-Boot] [PATCH 07/07] Coldfire: mcfmii: Allow non-autonegotiating PHYs to use mii command.

[Richard Retanubun]

Modified mii_init to support boards with PHYs that are not set to
autonegotiate, but still want to use u-boot's mii commands to probe
the smi bus. Such PHYs will not set the Autonegotiate-done bit.

---
  drivers/net/mcfmii.c |   27 +++++++++++++++++++--------
  1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 2b733c6..4f1c0a0 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -226,7 +226,8 @@ void __mii_init(void)
  	volatile FEC_T *fecp;
  	struct eth_device *dev;
  	int miispd = 0, i = 0;
-	u16 autoneg = 0;
+	u16 status = 0;
+	u16 linkgood = 0;

  	/* retrieve from register structure */
  	dev = eth_get_dev();
@@ -250,22 +251,32 @@ void __mii_init(void)

  	info->phy_addr = mii_discover_phy(dev);

-#define AUTONEGLINK		(PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
  	while (i < MCFFEC_TOUT_LOOP) {
-		autoneg = 0;
-		miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
+		status = 0;
  		i++;
-
-		if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
+		/* Read PHY control register */
+		miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &status);
+
+		/* If phy set to autonegotiate, wait for autonegotiation done,
+		 * if phy is not autonegotiating, just wait for link up.
+		 */
+		if ((status & PHY_BMCR_AUTON) == PHY_BMCR_AUTON) {
+			linkgood = (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS);
+		} else {
+			linkgood = PHY_BMSR_LS;
+		}
+		/* Read PHY status register */
+		miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &status);
+		if ((status & linkgood) == linkgood)
  			break;

  		udelay(500);
  	}
  	if (i >= MCFFEC_TOUT_LOOP) {
-		printf("Auto Negotiation not complete\n");
+		printf("Link UP timeout\n");
  	}

-	/* adapt to the half/full speed settings */
+	/* adapt to the duplex and speed settings of the phy */
  	info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
  	info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
  }
-- 
1.5.6.5

[U-Boot] [PATCH 07/07] [REBASED] Coldfire: mcfmii: Allow non-autonegotiating PHYs to use mii command.

[Richard Retanubun]

Modified mii_init to support boards with PHYs that are not set to
autonegotiate, but still want to use u-boot's mii commands to probe
the smi bus. Such PHYs will not set the Autonegotiate-done bit.


Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
---

Rebased on:

commit 9d8811c5bd2b7dd6307742cf22fbdb7953b6f816
Merge: 716ebf4... bd99ec1...
Author: Wolfgang Denk <wd@denx.de>
Date:   Tue Feb 3 23:16:15 2009 +0100

  drivers/net/mcfmii.c |   27 +++++++++++++++++++--------
  1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 2b733c6..4f1c0a0 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -226,7 +226,8 @@ void __mii_init(void)
  	volatile FEC_T *fecp;
  	struct eth_device *dev;
  	int miispd = 0, i = 0;
-	u16 autoneg = 0;
+	u16 status = 0;
+	u16 linkgood = 0;

  	/* retrieve from register structure */
  	dev = eth_get_dev();
@@ -250,22 +251,32 @@ void __mii_init(void)

  	info->phy_addr = mii_discover_phy(dev);

-#define AUTONEGLINK		(PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
  	while (i < MCFFEC_TOUT_LOOP) {
-		autoneg = 0;
-		miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
+		status = 0;
  		i++;
-
-		if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
+		/* Read PHY control register */
+		miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &status);
+
+		/* If phy set to autonegotiate, wait for autonegotiation done,
+		 * if phy is not autonegotiating, just wait for link up.
+		 */
+		if ((status & PHY_BMCR_AUTON) == PHY_BMCR_AUTON) {
+			linkgood = (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS);
+		} else {
+			linkgood = PHY_BMSR_LS;
+		}
+		/* Read PHY status register */
+		miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &status);
+		if ((status & linkgood) == linkgood)
  			break;

  		udelay(500);
  	}
  	if (i >= MCFFEC_TOUT_LOOP) {
-		printf("Auto Negotiation not complete\n");
+		printf("Link UP timeout\n");
  	}

-	/* adapt to the half/full speed settings */
+	/* adapt to the duplex and speed settings of the phy */
  	info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
  	info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
  }
-- 
1.5.6.5