Skip to contentSkip to conversation

drivers/net/tulip/: fix for Lite-On 82c168 PNIC (2.6.11)

PATCH Valerie Henson 1 participant 1 message Dec 8, 2006 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

Hi there, Guido,

Jeff resurrected this patch from the misty depths of the past. I double-checked the docs and the first bug fix is definitely correct. The second part isn't in the docs, but seems reasonable. Is this still the patch you are using? Any comments you want to add?

-VAL

Quoted 94 lines

From: Guido Classen <[email protected]>
To: [email protected], [email protected],
[email protected], [email protected]
Date: Fri, 01 Apr 2005 22:21:44 +0200
Subject: [PATCH] drivers/net/tulip/: fix for Lite-On 82c168 PNIC (2.6.11)

Hi,

this small patch fixes two issues with the Lite-On 82c168 PNIC adapters. I've tested it with two cards in different machines both chip rev 17

The first is the wrong register address CSR6 for writing the MII register which instead is 0xB8 (this may get a symbol too?) (see similar exisiting code
at line 437) in tulip_core.c

At least by my cards, the the bit 31 from the MII register seems to be somewhat unstable. This results in reading wrong values from the Phy-Registers
und prevents the card from correct initialization. I've added a litte delay and an second test of the bit. If the bit is stil cleared the read/write process has definitely finished.

Cheers
Guido

diff -ru linux-2.6.11-org/drivers/net/tulip/tulip_core.c linux-2.6.11.2-pentium/drivers/net/tulip/tulip_core.c
--- linux-2.6.11-org/drivers/net/tulip/tulip_core.c 2005-04-01
22:10:03.000000000 +0200
+++ linux-2.6.11.2-pentium/drivers/net/tulip/tulip_core.c 2005-03-31
23:14:11.000000000 +0200

(quoted diff) +0 -2
@@ -1701,8 +1701,8 @@
 			tp->nwayset = 0;
 			iowrite32(csr6_ttm | csr6_ca, ioaddr + CSR6);
 			iowrite32(0x30, ioaddr + CSR12);
-			iowrite32(0x0001F078, ioaddr + CSR6);
-			iowrite32(0x0201F078, ioaddr + CSR6); /* Turn on 

autonegotiation. */

(quoted diff) +2 -0
+			iowrite32(0x0001F078, ioaddr + 0xB8);
+			iowrite32(0x0201F078, ioaddr + 0xB8); /* Turn on 

autonegotiation. */

(quoted diff) +0 -0
 		}
 		break;
 	case MX98713:

diff -ru linux-2.6.11-org/drivers/net/tulip/media.c linux-2.6.11.2-pentium/drivers/net/tulip/media.c
--- linux-2.6.11-org/drivers/net/tulip/media.c 2005-04-01
22:10:03.000000000 +0200
+++ linux-2.6.11.2-pentium/drivers/net/tulip/media.c 2005-04-01
22:05:31.000000000 +0200

(quoted diff) +11 -2
@@ -74,8 +74,17 @@
 		ioread32(ioaddr + 0xA0);
 		while (--i > 0) {
 			barrier();
-			if ( ! ((retval = ioread32(ioaddr + 0xA0)) & 
 0x80000000))
-				break;
+			if ( ! ((retval = ioread32(ioaddr + 0xA0))
+                                & 0x80000000)) {
+                                /* bug in 82c168 rev 17?
+                                 * wait a little while and check if
+                                 * bit 31 is still cleared */
+                                udelay(10);
+                                if ( ! ((retval = ioread32(ioaddr + 0xA0))
+                                        & 0x80000000)) {
+                                        break;
+                                }
+                        }
 		}
 		spin_unlock_irqrestore(&tp->mii_lock, flags);
(quoted diff) +10 -2
 		return retval & 0xffff;
@@ -153,8 +162,16 @@
 		iowrite32(cmd, ioaddr + 0xA0);
 		do {
 			barrier();
-			if ( ! (ioread32(ioaddr + 0xA0) & 0x80000000))
-				break;
+			if ( ! (ioread32(ioaddr + 0xA0) & 0x80000000)) {
+                                /* bug in 82c168 rev 17?
+                                 * wait a little while and check if
+                                 * bit 31 is still cleared */
+                                udelay(10);
+                                if ( ! (ioread32(ioaddr + 0xA0)
+                                        & 0x80000000)) {
+                                        break;
+                                }
+                        }
 		} while (--i > 0);
 		spin_unlock_irqrestore(&tp->mii_lock, flags);
 		return;