From: hcg <hcg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Jun 2007 17:46:46 +0000 (+0000)
Subject: Fixed at91 ethernet driver for dm9161a PHY interrupt issue
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=00e5005064eda277a53357efedd85bc7d57675ed

Fixed at91 ethernet driver for dm9161a PHY interrupt issue


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7493 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/at91-2.6/patches/010-dm9161a-phyfix.patch b/target/linux/at91-2.6/patches/010-dm9161a-phyfix.patch
new file mode 100644
index 000000000..9ad8c4253
--- /dev/null
+++ b/target/linux/at91-2.6/patches/010-dm9161a-phyfix.patch
@@ -0,0 +1,28 @@
+--- linux-2.6.21.1/drivers/net/arm/at91_ether.c.old	2007-06-04 18:15:49.000000000 +0200
++++ linux-2.6.21.1/drivers/net/arm/at91_ether.c	2007-06-04 18:10:36.000000000 +0200
+@@ -146,6 +146,7 @@
+ 	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 @@
+ 	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;