[kernel] r18078 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 11 22:56:08 2011
New Revision: 18078

Log:
igb: Fix lack of flush after register write and before delay

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/igb-Fix-lack-of-flush-after-register-write-and-befor.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 22:49:25 2011	(r18077)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 22:56:08 2011	(r18078)
@@ -50,7 +50,7 @@
     - Fix support for i82577, i82578 and i82583
   * e1000e: Fix selection of alternate MAC address on device id 0x1060
     (regression in 2.6.34)
-  * igb,igbvf: Backport changes up to Linux 3.0 (Closes: #627702)
+  * igb,igbvf: Backport changes up to Linux 3.0.4 (Closes: #627702)
     - Add support for i82576-ET2, i82580, DH89xxCC, i340 and i350
   * r8169: Backport changes up to Linux 3.0.2 (Closes: #627704)
     - Fix support for RTL8102E and RTL8168DP

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/igb-Fix-lack-of-flush-after-register-write-and-befor.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/igb-Fix-lack-of-flush-after-register-write-and-befor.patch	Sun Sep 11 22:56:08 2011	(r18078)
@@ -0,0 +1,35 @@
+From: Carolyn Wyborny <carolyn.wyborny at intel.com>
+Date: Sat, 25 Jun 2011 13:18:12 +0000
+Subject: [PATCH] igb: Fix lack of flush after register write and before delay
+
+commit 064b43304ed8ede8e13ff7b4338d09fd37bcffb1 upstream.
+
+Register writes followed by a delay are required to have a flush
+before the delay in order to commit the values to the register.  Without
+the flush, the code following the delay may not function correctly.
+
+Reported-by: Tong Ho <tong.ho at ericsson.com>
+Reported-by: Guenter Roeck <guenter.roeck at ericsson.com>
+Signed-off-by: Carolyn Wyborny <carolyn.wyborny at intel.com>
+Tested-by:  Aaron Brown <aaron.f.brown at intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/net/igb/e1000_82575.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
+index 0f563c8..493e331 100644
+--- a/drivers/net/igb/e1000_82575.c
++++ b/drivers/net/igb/e1000_82575.c
+@@ -1735,6 +1735,7 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
+ 		ctrl |= E1000_CTRL_RST;
+ 
+ 	wr32(E1000_CTRL, ctrl);
++	wrfl();
+ 
+ 	/* Add delay to insure DEV_RST has time to complete */
+ 	if (global_device_reset)
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 22:49:25 2011	(r18077)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 22:56:08 2011	(r18078)
@@ -693,3 +693,4 @@
 + bugfix/all/stable/2.6.32.46.patch
 
 + bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
++ bugfix/all/igb-Fix-lack-of-flush-after-register-write-and-befor.patch