generic: ar8216: improve ar8216_wait_bit function
authorGabor Juhos <juhosg@openwrt.org>
Wed, 7 Mar 2012 16:32:45 +0000 (16:32 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Wed, 7 Mar 2012 16:32:45 +0000 (16:32 +0000)
SVN-Revision: 30847

target/linux/generic/files/drivers/net/phy/ar8216.c

index 2e3a8426b0ec9364b839fa97be23c99dd914bf52..26a79be7ef523949841588f9695acd1d34a51d01 100644 (file)
@@ -468,14 +468,22 @@ static int
 ar8216_wait_bit(struct ar8216_priv *priv, int reg, u32 mask, u32 val)
 {
        int timeout = 20;
+       u32 t = 0;
 
-       while ((priv->read(priv, reg) & mask) != val) {
-               if (timeout-- <= 0) {
-                       printk(KERN_ERR "ar8216: timeout waiting for operation to complete\n");
-                       return 1;
-               }
+       while (1) {
+               t = priv->read(priv, reg);
+               if ((t & mask) == val)
+                       return 0;
+
+               if (timeout-- <= 0)
+                       break;
+
+               udelay(10);
        }
-       return 0;
+
+       pr_err("ar8216: timeout on reg %08x: %08x & %08x != %08x\n",
+              (unsigned int) reg, t, mask, val);
+       return -ETIMEDOUT;
 }
 
 static void
@@ -958,11 +966,8 @@ ar8216_read_status(struct phy_device *phydev)
        /* flush the address translation unit */
        mutex_lock(&priv->reg_mutex);
        ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
-
        if (!ret)
                priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
-       else
-               ret = -ETIMEDOUT;
        mutex_unlock(&priv->reg_mutex);
 
        phydev->state = PHY_RUNNING;