source: patches/linux-2.6.17.13-tulip-1.patch @ cef1c09

drivers/net/tulip/21142.c

@@ -172 +172 @@
                         int i;
                         for (i = 0; i < tp->mtable->leafcount; i++)
                                 if (tp->mtable->mleaf[i].media == dev->if_port) {
-                                        int startup = ! ((tp->chip_id == DC21143 && (tp->revision == 48 || tp->revision == 65)));
+                                        int startup = ! ((tp->chip_id == DC21143 && tp->revision == 65));
                                         tp->cur_index = i;
                                         tulip_select_media(dev, startup);
                                         setup_done = 1;

drivers/net/tulip/media.c

@@ -44 +44 @@
 
 /* MII transceiver control section.
    Read and write the MII registers using software-generated serial
-   MDIO protocol.  See the MII specifications or DP83840A data sheet
-   for details. */
+   MDIO protocol.
+   See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management functions")
+   or DP83840A data sheet for more details.
+   */
 
 int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
 {
@@ -261 +263 @@
                                 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;
                                 int reset_length = p[2 + init_length];
                                 misc_info = (u16*)(reset_sequence + reset_length);
                                 if (startup) {
+                                        int timeout = 10;       /* max 1 ms */
                                         iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
                                         for (i = 0; i < reset_length; i++)
                                                 iowrite32(reset_sequence[i], ioaddr + CSR12);
+
+                                        /* flush posted writes */
+                                        ioread32(ioaddr + CSR12);
+
+                                        /* 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(init_sequence[i], ioaddr + CSR12);
+
+                                ioread32(ioaddr + CSR12);       /* flush posted writes */
                         }
+
                         tmp_info = get_u16(&misc_info[1]);
                         if (tmp_info)
                                 tp->advertising[phy_num] = tmp_info | 1;

drivers/net/tulip/tulip.h

@@ -474 +474 @@
                         udelay(10);
 
                 if (!i)
-                        printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
-                                        pci_name(tp->pdev));
+                        printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
+                                        " (CSR5 0x%x CSR6 0x%x)\n",
+                                        pci_name(tp->pdev),
+                                        ioread32(ioaddr + CSR5),
+                                        ioread32(ioaddr + CSR6));
         }
 }
 

drivers/net/tulip/tulip_core.c

@@ -22 +22 @@
 #else
 #define DRV_VERSION     "1.1.13"
 #endif
-#define DRV_RELDATE     "May 11, 2002"
+#define DRV_RELDATE     "December 15, 2004"
 
 
 #include <linux/module.h>
@@ -148 +148 @@
         HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_PCI_MWI, tulip_timer },
 
   /* DC21142, DC21143 */
-  { "Digital DS21143 Tulip", 128, 0x0801fbff,
+  { "Digital DS21142/DS21143 Tulip", 128, 0x0801fbff,
         HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
         | HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },