2.6 PReP fix? (Was: [jgarzik@pobox.com: [PATCH/CFT] de2104x fixes])

Can people that are having enet troubles on 2.6 on PReP boxes with a
2104x give this a shot and see if it fixes their problems?

----- Forwarded message from Jeff Garzik [off-list ref] -----

Date: Sat, 22 Nov 2003 07:07:57 -0500
From: Jeff Garzik <redacted>
To: russell@coker.com.au
CC: Linux Kernel <redacted>
Subject: [PATCH/CFT] de2104x fixes

Russell Coker wrote:

On Sat, 22 Nov 2003 05:50, Jeff Garzik [off-list ref] wrote:

quoted

So, can people give this a test?  It includes a change that, I hope,
addresses Russell's problem, as well as a patch from Rask.

It does not compile for me, below are the warnings and errors.  I am using
2.6.0-test9 with no patches applied other than your patch.

drivers/net/tulip/de2104x.c: In function `de_open':
drivers/net/tulip/de2104x.c:1369: warning: unused variable `flags'
drivers/net/tulip/de2104x.c: In function `__de_set_settings':
drivers/net/tulip/de2104x.c:1572: error: `dev' undeclared (first use in
this function)
drivers/net/tulip/de2104x.c:1572: error: (Each undeclared identifier is
reported only once
drivers/net/tulip/de2104x.c:1572: error: for each function it appears in.)

Ok, here's a better patch.  It's against 2.6.0-test9-BK-latest
(currently bk25).

===== drivers/net/tulip/de2104x.c 1.25 vs edited =====

--- 1.25/drivers/net/tulip/de2104x.c	Thu Sep 11 18:46:11 2003
+++ edited/drivers/net/tulip/de2104x.c	Sat Nov 22 07:05:40 2003

@@ -28,8 +28,8 @@
  */

 #define DRV_NAME		"de2104x"
-#define DRV_VERSION		"0.6"
-#define DRV_RELDATE		"Sep 1, 2003"
+#define DRV_VERSION		"0.9"
+#define DRV_RELDATE		"Nov 21, 2003"

 #include <linux/config.h>
 #include <linux/module.h>

@@ -1366,7 +1366,6 @@
 {
 	struct de_private *de = dev->priv;
 	int rc;
-	unsigned long flags;

 	if (netif_msg_ifup(de))
 		printk(KERN_DEBUG "%s: enabling interface\n", dev->name);

@@ -1380,18 +1379,18 @@
 		return rc;
 	}

-	rc = de_init_hw(de);
+	rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
 	if (rc) {
-		printk(KERN_ERR "%s: h/w init failure, err=%d\n",
-		       dev->name, rc);
+		printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
+		       dev->name, dev->irq, rc);
 		goto err_out_free;
 	}

-	rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
+	rc = de_init_hw(de);
 	if (rc) {
-		printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
-		       dev->name, dev->irq, rc);
-		goto err_out_hw;
+		printk(KERN_ERR "%s: h/w init failure, err=%d\n",
+		       dev->name, rc);
+		goto err_out_free_irq;
 	}

 	netif_start_queue(dev);

@@ -1399,10 +1398,8 @@

 	return 0;

-err_out_hw:
-	spin_lock_irqsave(&de->lock, flags);
-	de_stop_hw(de);
-	spin_unlock_irqrestore(&de->lock, flags);
+err_out_free_irq:
+	free_irq (dev->irq, dev);

 err_out_free:
 	de_free_rings(de);

@@ -1514,7 +1511,8 @@
 	return 0;
 }

-static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)
+static int __de_set_settings(struct net_device *dev, struct de_private *de,
+			     struct ethtool_cmd *ecmd)
 {
 	u32 new_media;
 	unsigned int media_lock;

@@ -1571,13 +1569,17 @@
 	    (ecmd->advertising == de->media_advertise))
 		return 0; /* nothing to change */

-	de_link_down(de);
-	de_stop_rxtx(de);
+	if (netif_running(dev)) {
+		de_link_down(de);
+		de_stop_rxtx(de);
+	}

 	de->media_type = new_media;
 	de->media_lock = media_lock;
 	de->media_advertise = ecmd->advertising;
-	de_set_media(de);
+
+	if (netif_running(dev))
+		de_set_media(de);

 	return 0;
 }

@@ -1615,7 +1617,7 @@
 	int rc;

 	spin_lock_irq(&de->lock);
-	rc = __de_set_settings(de, ecmd);
+	rc = __de_set_settings(dev, de, ecmd);
 	spin_unlock_irq(&de->lock);

 	return rc;


----- End forwarded message -----

--

Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Tom Rini wrote:

Ok, here's a better patch.  It's against 2.6.0-test9-BK-latest
(currently bk25).

[...]

i don't have a -bk tree here, so i get a .rej with -test9 and -test10:

evil@sheep:/usr/src/linux-2.6$ cat /data/Incoming/de2104x.c.diff |  \
patch -p1 --dry-run
patching file drivers/net/tulip/de2104x.c
Hunk #6 FAILED at 1569.
1 out of 7 hunks FAILED -- saving rejects to file
drivers/net/tulip/de2104x.c.rej
evil@sheep:/usr/src/linux-2.6$


so, drivers/net/tulip/de2104x.c.rej contains:


***************
*** 1571,1583 ****
             (ecmd->advertising == de->media_advertise))
                 return 0; /* nothing to change */

-       de_link_down(de);
-       de_stop_rxtx(de);

         de->media_type = new_media;
         de->media_lock = media_lock;
         de->media_advertise = ecmd->advertising;
-       de_set_media(de);

         return 0;
   }

--- 1569,1585 ----
             (ecmd->advertising == de->media_advertise))
                 return 0; /* nothing to change */

+       if (netif_running(dev)) {
+               de_link_down(de);
+               de_stop_rxtx(de);
+       }

         de->media_type = new_media;
         de->media_lock = media_lock;
         de->media_advertise = ecmd->advertising;
+
+       if (netif_running(dev))
+               de_set_media(de);

         return 0;
   }
-------------------------------------------

it takes a while to compile....

Christian.
--
BOFH excuse #20:

divide-by-zero error


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

On Thu, Nov 27, 2003 at 12:31:01AM +0100, Christian Kujau wrote:

Tom Rini wrote:

quoted

Ok, here's a better patch.  It's against 2.6.0-test9-BK-latest
(currently bk25).

[...]

i don't have a -bk tree here, so i get a .rej with -test9 and -test10:

The particular snapshot Jeff is referring to is available at:
http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/incr/

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Christian Kujau wrote:

Tom Rini wrote:

quoted

Ok, here's a better patch.  It's against 2.6.0-test9-BK-latest
(currently bk25).

[...]

i don't have a -bk tree here, so i get a .rej with -test9 and -test10:

evil@sheep:/usr/src/linux-2.6$ cat /data/Incoming/de2104x.c.diff |  \
patch -p1 --dry-run
patching file drivers/net/tulip/de2104x.c
Hunk #6 FAILED at 1569.
1 out of 7 hunks FAILED -- saving rejects to file
drivers/net/tulip/de2104x.c.rej
evil@sheep:/usr/src/linux-2.6$

but it seems to compile:


   CC      drivers/net/net_init.o
   CC      drivers/net/loopback.o
   CC [M]  drivers/net/tulip/de2104x.o
   CC [M]  drivers/net/tulip/eeprom.o
   CC [M]  drivers/net/tulip/interrupt.o
   CC [M]  drivers/net/tulip/media.o
   CC [M]  drivers/net/tulip/timer.o
   CC [M]  drivers/net/tulip/tulip_core.o
   CC [M]  drivers/net/tulip/21142.o
   CC [M]  drivers/net/tulip/pnic.o
   CC [M]  drivers/net/tulip/pnic2.o
   LD [M]  drivers/net/tulip/tulip.o
   CC [M]  drivers/net/tulip/de4x5.o
   LD      drivers/net/built-in.o
   CC [M]  drivers/net/3c59x.o


(compile will finish soon, but have to to sleep now, ...blip..)
Christian.

--
BOFH excuse #20:

divide-by-zero error


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/