Author: tbm
Date: Mon May 21 09:19:01 2007
New Revision: 8620
Log:
the 64bit tulip fixes finally got accepted. yeah!
Modified:
dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch
(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch Mon May
21 09:19:01 2007
@@ -1,101 +1,10 @@
## DP: Tulip - fixes compile on MIPS64.
-## DP: Path author: Grant Grundler <[EMAIL PROTECTED]>
-## DP: Basically got rejected as it by Jeff Garzik but needed for now.
-## DP: Has been used by the HPPA folks for years
+## DP: Path author: Peter Horton <[EMAIL PROTECTED]>
+## DP: Not sure whether this is needed or not, but we've had it for
+## DP: quite a while. I'll try to find out -- tbm
-From: Jim Gifford <[EMAIL PROTECTED]>
-
-I have been working on getting the RaQ2 to build using 64 bit. I ran
-into numerous issues. After I got the kernel to compile, the tulip
-driver didn't work. It kept showing error messages like
-tulip_stop_rxtx() failed
-
-This patch fixes the compile issue, this patch was create by Grant
-Grundler of linux-parsic. This patch matches the tulip driver follow the
-specs laid out by the manufacture. On 32 bit this patch seemed to make
-the tulip more responsive on my RaQ2 systems.
-
---- a/drivers/net/tulip/media.c 2006-11-19 19:15:04.000000000 +0000
-+++ b/drivers/net/tulip/media.c 2006-11-19 19:15:11.000000000 +0000
-@@ -44,8 +44,10 @@
-
- /* 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)
- {
-@@ -272,13 +274,29 @@
- 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;
-@@ -365,8 +383,6 @@
-
- tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 :
0);
-
-- mdelay(1);
--
- return;
- }
-
--- a/drivers/net/tulip/tulip.h 2006-11-19 19:14:20.000000000 +0000
+++ b/drivers/net/tulip/tulip.h 2006-11-19 19:15:11.000000000 +0000
-@@ -489,8 +489,11 @@
- 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));
- }
- }
-
---- a/drivers/net/tulip/tulip_core.c 2006-11-19 19:15:09.000000000 +0000
-+++ b/drivers/net/tulip/tulip_core.c 2006-11-19 19:15:11.000000000 +0000
-@@ -21,7 +21,7 @@
- #else
- #define DRV_VERSION "1.1.14"
- #endif
--#define DRV_RELDATE "May 11, 2002"
-+#define DRV_RELDATE "December 15, 2004"
-
-
- #include <linux/module.h>
@@ -1493,8 +1493,8 @@
(PCI_SLOT(pdev->devfn) == 12))) {
/* Cobalt MAC address in first EEPROM locations. */
@@ -107,3 +16,4 @@
}
#endif
#ifdef CONFIG_GSC
+
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon May
21 09:19:01 2007
@@ -16,7 +16,7 @@
+ bugfix/mips/ide-scan.patch
+ bugfix/mips/ip22-zilog-console.patch
+ bugfix/mips/sgi-ioc3.patch
-#+ bugfix/mips/64bit-tulip.patch
++ bugfix/mips/64bit-tulip.patch
+ bugfix/mips/tulip_dc21143.patch
+ features/mips/qemu-vga.patch
+ features/mips/sb1-duart.patch
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
