Author: jim
Date: 2005-11-03 23:35:27 -0700 (Thu, 03 Nov 2005)
New Revision: 1235
Modified:
trunk/
trunk/linux/linux-2.6.14-mips_fix-1.patch
Log:
[EMAIL PROTECTED]: jim | 2005-11-03 22:32:15 -0800
Updated mips patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1455
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1465
Modified: trunk/linux/linux-2.6.14-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.14-mips_fix-1.patch 2005-11-04 05:29:00 UTC (rev
1234)
+++ trunk/linux/linux-2.6.14-mips_fix-1.patch 2005-11-04 06:35:27 UTC (rev
1235)
@@ -99505,39 +99505,130 @@
+int titan_ge_mdio_write(int, int, unsigned int);
+
+#endif /* _TITAN_MDIO_H */
-diff -Naur linux-2.6.14.orig/drivers/net/tulip/de2104x.c
linux-2.6.14/drivers/net/tulip/de2104x.c
---- linux-2.6.14.orig/drivers/net/tulip/de2104x.c 2005-10-28
00:02:08.000000000 +0000
-+++ linux-2.6.14/drivers/net/tulip/de2104x.c 2005-11-03 05:29:20.000000000
+0000
-@@ -1787,10 +1787,15 @@
- /* DEC now has a specification but early board makers
- just put the address in the first EEPROM locations. */
- /* This does memcmp(eedata, eedata+16, 8) */
+diff -Naur linux-2.6.14.orig/drivers/net/tulip/21142.c
linux-2.6.14/drivers/net/tulip/21142.c
+--- linux-2.6.14.orig/drivers/net/tulip/21142.c 2005-10-28
00:02:08.000000000 +0000
++++ linux-2.6.14/drivers/net/tulip/21142.c 2005-11-04 06:16:14.000000000
+0000
+@@ -172,7 +172,7 @@
+ 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;
+diff -Naur linux-2.6.14.orig/drivers/net/tulip/media.c
linux-2.6.14/drivers/net/tulip/media.c
+--- linux-2.6.14.orig/drivers/net/tulip/media.c 2005-10-28
00:02:08.000000000 +0000
++++ linux-2.6.14/drivers/net/tulip/media.c 2005-11-04 06:16:14.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)
+ {
+@@ -261,24 +263,56 @@
+ 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);
+
-+#ifndef CONFIG_MIPS_COBALT
++ /* Sect 3.10.3 in DP83840A.pdf (p39) */
++ udelay(500);
+
- for (i = 0; i < 8; i ++)
- if (ee_data[i] != ee_data[16+i])
- sa_offset = 20;
++ /* 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;
+diff -Naur linux-2.6.14.orig/drivers/net/tulip/tulip.h
linux-2.6.14/drivers/net/tulip/tulip.h
+--- linux-2.6.14.orig/drivers/net/tulip/tulip.h 2005-10-28
00:02:08.000000000 +0000
++++ linux-2.6.14/drivers/net/tulip/tulip.h 2005-11-04 06:16:14.000000000
+0000
+@@ -474,8 +474,11 @@
+ udelay(10);
-+#endif
-+
- /* store MAC address */
- for (i = 0; i < 6; i ++)
- de->dev->dev_addr[i] = ee_data[i + sa_offset];
+ 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));
+ }
+ }
+
diff -Naur linux-2.6.14.orig/drivers/net/tulip/tulip_core.c
linux-2.6.14/drivers/net/tulip/tulip_core.c
--- linux-2.6.14.orig/drivers/net/tulip/tulip_core.c 2005-10-28
00:02:08.000000000 +0000
-+++ linux-2.6.14/drivers/net/tulip/tulip_core.c 2005-11-03
05:29:20.000000000 +0000
-@@ -1495,8 +1495,8 @@
- if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
- /* DDB5477 MAC address in first EEPROM locations. */
- sa_offset = 0;
-- /* No media table either */
-- tp->flags &= ~HAS_MEDIA_TABLE;
-+ /* Ensure our media table fixup get's applied */
-+ memcpy(ee_data + 16, ee_data, 8);
- }
++++ linux-2.6.14/drivers/net/tulip/tulip_core.c 2005-11-04
06:16:14.000000000 +0000
+@@ -22,7 +22,7 @@
+ #else
+ #define DRV_VERSION "1.1.13"
#endif
- #ifdef CONFIG_MIPS_COBALT
+-#define DRV_RELDATE "May 11, 2002"
++#define DRV_RELDATE "December 15, 2004"
+
+
+ #include <linux/module.h>
+@@ -148,7 +148,7 @@
+ 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 },
+
diff -Naur linux-2.6.14.orig/drivers/pci/.gitignore
linux-2.6.14/drivers/pci/.gitignore
--- linux-2.6.14.orig/drivers/pci/.gitignore 2005-10-28 00:02:08.000000000
+0000
+++ linux-2.6.14/drivers/pci/.gitignore 1970-01-01 00:00:00.000000000
+0000
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
