diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 16:50:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-24 16:50:17 -0700 |
| commit | 94bb6717b4d1a86b70be62e3df0297ecde496fbb (patch) | |
| tree | dd66d94dbe90729eb0cbaa36cc54a1c8bf67020c | |
| parent | 1b5110d710a13ced579dcda6cf1074408adfdee5 (diff) | |
| download | longterm-queue-2.6.33-94bb6717b4d1a86b70be62e3df0297ecde496fbb.tar.gz | |
.33 patches
| -rw-r--r-- | queue-2.6.33/igb-fix-lack-of-flush-after-register-write-and-before-delay.patch | 34 | ||||
| -rw-r--r-- | queue-2.6.33/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/queue-2.6.33/igb-fix-lack-of-flush-after-register-write-and-before-delay.patch b/queue-2.6.33/igb-fix-lack-of-flush-after-register-write-and-before-delay.patch new file mode 100644 index 0000000..6d65e0c --- /dev/null +++ b/queue-2.6.33/igb-fix-lack-of-flush-after-register-write-and-before-delay.patch @@ -0,0 +1,34 @@ +From 064b43304ed8ede8e13ff7b4338d09fd37bcffb1 Mon Sep 17 00:00:00 2001 +From: Carolyn Wyborny <carolyn.wyborny@intel.com> +Date: Sat, 25 Jun 2011 13:18:12 +0000 +Subject: igb: Fix lack of flush after register write and before delay + +From: Carolyn Wyborny <carolyn.wyborny@intel.com> + +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@ericsson.com> +Reported-by: Guenter Roeck <guenter.roeck@ericsson.com> +Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> +Tested-by: Aaron Brown <aaron.f.brown@intel.com> +Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/net/igb/e1000_82575.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/igb/e1000_82575.c ++++ b/drivers/net/igb/e1000_82575.c +@@ -1527,6 +1527,7 @@ static s32 igb_reset_hw_82580(struct e10 + ctrl |= E1000_CTRL_RST; + + wr32(E1000_CTRL, ctrl); ++ wrfl(); + + /* Add delay to insure DEV_RST has time to complete */ + if (global_device_reset) diff --git a/queue-2.6.33/series b/queue-2.6.33/series index 66042da..ee481bb 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -17,3 +17,4 @@ x86-32-vdso-on-system-call-restart-after-sysenter-use-int.patch x86-uv-remove-uv-delay-in-starting-slave-cpus.patch drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch fuse-check-size-of-fuse_notify_inval_entry-message.patch +igb-fix-lack-of-flush-after-register-write-and-before-delay.patch |