tlan: Add PHY reset timeout

Add a timeout to prevent infinite loop waiting for PHY to reset.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index c4021de7ebea..8278150119d5 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -2568,6 +2568,7 @@ static void tlan_phy_reset(struct net_device *dev)
         struct tlan_priv        *priv = netdev_priv(dev);
         u16             phy;
         u16             value;
+        unsigned long timeout = jiffies + HZ;
 
         phy = priv->phy[priv->phy_num];
 
@@ -2575,9 +2576,13 @@ static void tlan_phy_reset(struct net_device *dev)
         tlan_mii_sync(dev->base_addr);
         value = MII_GC_LOOPBK | MII_GC_RESET;
         tlan_mii_write_reg(dev, phy, MII_GEN_CTL, value);
-        tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
-        while (value & MII_GC_RESET)
+        do {
                 tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
+                if (time_after(jiffies, timeout)) {
+                        netdev_err(dev, "PHY reset timeout\n");
+                        return;
+                }
+        } while (value & MII_GC_RESET);
 
         /* Wait for 500 ms and initialize.
          * I don't remember why I wait this long.