2008-07-26 13:53:23 +03:00
|
|
|
--- a/drivers/net/arm/at91_ether.c
|
|
|
|
|
+++ b/drivers/net/arm/at91_ether.c
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
|
2008-07-04 19:05:00 +03:00
|
|
|
struct at91_private *lp = netdev_priv(dev);
|
|
|
|
|
unsigned int bmsr, bmcr, lpa, mac_cfg;
|
|
|
|
|
unsigned int speed, duplex;
|
|
|
|
|
+ unsigned long timeout = jiffies + HZ;
|
|
|
|
|
|
|
|
|
|
if (!mii_link_ok(&lp->mii)) { /* no link */
|
|
|
|
|
netif_carrier_off(dev);
|
2008-11-07 10:44:56 +02:00
|
|
|
@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
|
2008-07-04 19:05:00 +03:00
|
|
|
read_phy(lp->phy_address, MII_BMSR, &bmsr);
|
|
|
|
|
read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
|
|
|
|
if (bmcr & BMCR_ANENABLE) { /* AutoNegotiation is enabled */
|
|
|
|
|
- if (!(bmsr & BMSR_ANEGCOMPLETE))
|
|
|
|
|
- return; /* Do nothing - another interrupt generated when negotiation complete */
|
|
|
|
|
+ while (!(bmsr & BMSR_ANEGCOMPLETE)) {
|
|
|
|
|
+ if (time_after(jiffies, timeout)) {
|
|
|
|
|
+ printk("at91_ether: Auto-negotiate timeout\n");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ read_phy(lp->phy_address, MII_BMSR, &bmsr);
|
|
|
|
|
+ read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
|
|
|
|
+ cpu_relax();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
read_phy(lp->phy_address, MII_LPA, &lpa);
|
|
|
|
|
if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
|
