Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=eb117b1786804f2e128b871879ffe8f6a2701378
Commit:     eb117b1786804f2e128b871879ffe8f6a2701378
Parent:     b3bff39a2b3574542f5007e19038393dfdd64c85
Author:     Thibaut VARENE <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 12 02:31:30 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 11:00:58 2007 -0400

    TULIP: Natsemi dp83840a PHY fix
    
    Fix a problem with Tulip 21142 HP branded PCI cards (PN#: B5509-66001),
    which feature a NatSemi DP83840A PHY.
    
    Without that patch, it is impossible to properly initialize the card's PHY,
    and it's thus impossible to monitor/configure it.
    
    [VAL: I'm happy with the 1.5 ms max delay; it doesn't seem excessive.]
    
    Signed-off-by: Thibaut VARENE <[EMAIL PROTECTED]>
    Cc: Jeff Garzik <[EMAIL PROTECTED]>
    Acked-by: Grant Grundler <[EMAIL PROTECTED]>
    Signed-off-by: Valerie Henson <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/tulip/media.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index 1594160..b562566 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -263,11 +263,27 @@ void tulip_select_media(struct net_device *dev, int 
startup)
                                u16 *reset_sequence = 
&((u16*)(p+3))[init_length];
                                int reset_length = p[2 + init_length*2];
                                misc_info = reset_sequence + reset_length;
-                               if (startup)
+                               if (startup) {
+                                       int timeout = 10;       /* max 1 ms */
                                        for (i = 0; i < reset_length; i++)
                                                
iowrite32(get_u16(&reset_sequence[i]) << 16, ioaddr + CSR15);
+
+                                       /* flush posted writes */
+                                       ioread32(ioaddr + CSR15);
+
+                                       /* Sect 3.10.3 in DP83840A.pdf (p39) */
+                                       udelay(500);
+
+                                       /* Section 4.2 in DP83840A.pdf (p43) */
+                                       /* and IEEE 802.3 "22.2.4.1.1 Reset" */
+                                       while (timeout-- &&
+                                               (tulip_mdio_read (dev, phy_num, 
MII_BMCR) & BMCR_RESET))
+                                               udelay(100);
+                               }
                                for (i = 0; i < init_length; i++)
                                        iowrite32(get_u16(&init_sequence[i]) << 
16, ioaddr + CSR15);
+
+                               ioread32(ioaddr + CSR15);       /* flush posted 
writes */
                        } else {
                                u8 *init_sequence = p + 2;
                                u8 *reset_sequence = p + 3 + init_length;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to