diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2008-07-04 16:05:00 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2008-07-04 16:05:00 +0000 |
| commit | 34d362d1a7c6c28b7a2d7c364972ef14091b29b9 (patch) | |
| tree | bb791c41e8f5e2529c42eb05f202af8faf2024e5 /target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | |
| parent | 385bcf948bbecb0db8f0b59f20453629b9e1deb1 (diff) | |
| download | upstream-34d362d1a7c6c28b7a2d7c364972ef14091b29b9.tar.gz upstream-34d362d1a7c6c28b7a2d7c364972ef14091b29b9.tar.bz2 upstream-34d362d1a7c6c28b7a2d7c364972ef14091b29b9.zip | |
First stage of update for at91 devices to 2.6.25.10 kernel
SVN-Revision: 11631
Diffstat (limited to 'target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch')
| -rw-r--r-- | target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch new file mode 100644 index 0000000000..120c32e283 --- /dev/null +++ b/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch @@ -0,0 +1,30 @@ +Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c +=================================================================== +--- linux-2.6.22.19.orig/drivers/net/arm/at91_ether.c ++++ linux-2.6.22.19/drivers/net/arm/at91_ether.c +@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_ + 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); +@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_ + 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; |