[kernel] r12737 - in dists/sid/linux-2.6/debian: . patches/bugfix/sparc patches/series

[Dann Frazier]

Author: dannf
Date: Mon Feb  9 23:55:55 2009
New Revision: 12737

Log:
Fix softlockups in sungem driver (Closes: #514624)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/sparc/sungem-soft-lockup-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Feb  9 23:55:55 2009
@@ -19,6 +19,7 @@
   * sctp: fix memory overflow (CVE-2009-0065)
   * Fix sign-extend ABI issue w/ system calls on various 64-bit architectures
     (CVE-2009-0029)
+  * Fix softlockups in sungem driver (Closes: #514624)
 
   [ Martin Michlmayr ]
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
@@ -29,7 +30,7 @@
   * [sparc] Revert: Reintroduce dummy PCI host controller to workaround broken
     X.org. Not supportable and breaks to many things.
 
- -- dann frazier <dannf at debian.org>  Mon, 09 Feb 2009 00:11:37 -0700
+ -- dann frazier <dannf at debian.org>  Mon, 09 Feb 2009 11:14:31 -0700
 
 linux-2.6 (2.6.26-13) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/sparc/sungem-soft-lockup-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/sungem-soft-lockup-fix.patch	Mon Feb  9 23:55:55 2009
@@ -0,0 +1,68 @@
+From: Ilkka Virta <itvirta at iki.fi>
+Date: Sat, 7 Feb 2009 06:00:36 +0000 (-0800)
+Subject: sungem: Soft lockup in sungem on Netra AC200 when switching interface up
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-2.6.git;a=commitdiff_plain;h=71822faa3bc0af5dbf5e333a2d085f1ed7cd809f
+
+sungem: Soft lockup in sungem on Netra AC200 when switching interface up
+
+From: Ilkka Virta <itvirta at iki.fi>
+
+In the lockup situation the driver seems to go off in an eternal storm
+of interrupts right after calling request_irq(). It doesn't actually
+do anything interesting in the interrupt handler. Since connecting the link
+afterwards works, something later in initialization must fix this.
+
+Looking at gem_do_start() and gem_open(), it seems that the only thing
+done while opening the device after the request_irq(), is a call to
+napi_enable().
+
+I don't know what the ordering requirements are for the
+initialization, but I boldly tried to move the napi_enable() call
+inside gem_do_start() before the link state is checked and interrupts
+subsequently enabled, and it seems to work for me. Doesn't even break
+anything too obvious...
+
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.26.orig/drivers/net/sungem.c linux-source-2.6.26/drivers/net/sungem.c
+--- linux-source-2.6.26.orig/drivers/net/sungem.c	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/drivers/net/sungem.c	2009-02-09 10:40:57.000000000 -0700
+@@ -2205,6 +2205,8 @@ static int gem_do_start(struct net_devic
+ 
+ 	gp->running = 1;
+ 
++	napi_enable(&gp->napi);
++
+ 	if (gp->lstate == link_up) {
+ 		netif_carrier_on(gp->dev);
+ 		gem_set_link_modes(gp);
+@@ -2222,6 +2224,8 @@ static int gem_do_start(struct net_devic
+ 		spin_lock_irqsave(&gp->lock, flags);
+ 		spin_lock(&gp->tx_lock);
+ 
++		napi_disable(&gp->napi);
++
+ 		gp->running =  0;
+ 		gem_reset(gp);
+ 		gem_clean_rings(gp);
+@@ -2322,8 +2326,6 @@ static int gem_open(struct net_device *d
+ 	if (!gp->asleep)
+ 		rc = gem_do_start(dev);
+ 	gp->opened = (rc == 0);
+-	if (gp->opened)
+-		napi_enable(&gp->napi);
+ 
+ 	mutex_unlock(&gp->pm_mutex);
+ 
+@@ -2460,8 +2462,6 @@ static int gem_resume(struct pci_dev *pd
+ 
+ 		/* Re-attach net device */
+ 		netif_device_attach(dev);
+-
+-		napi_enable(&gp->napi);
+ 	}
+ 
+ 	spin_lock_irqsave(&gp->lock, flags);

Modified: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14	(original)
+++ dists/sid/linux-2.6/debian/patches/series/14	Mon Feb  9 23:55:55 2009
@@ -60,3 +60,4 @@
 + bugfix/x86/alsa-hda-ad2000bx-quirk.patch
 + bugfix/x86/alsa-hda-support-ecs-chips-with-sigmatel-codecs.patch
 + bugfix/x86/alsa-hda-add-support-for-toshiba-l305.patch
++ bugfix/sparc/sungem-soft-lockup-fix.patch