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

[Dann Frazier]

Author: dannf
Date: Mon May 16 00:59:17 2011
New Revision: 17423

Log:
cciss: fix lost command issue

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/cciss-fix-lost-command-issue.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/27

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:59:11 2011	(r17422)
+++ dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:59:17 2011	(r17423)
@@ -30,6 +30,7 @@
     - md: fix regression with re-adding devices to arrays with no metadata
     - [x86] Flush TLB if PGD entry is changed in i386 PAE mode
     - ext3: skip orphan cleanup on rocompat fs
+    - cciss: fix lost command issue
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/cciss-fix-lost-command-issue.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/cciss-fix-lost-command-issue.patch	Mon May 16 00:59:17 2011	(r17423)
@@ -0,0 +1,32 @@
+commit 798d07510c753dd6a63a991f256a4dbfb366ebe2
+Author: Bud Brown <bud.brown at redhat.com>
+Date:   Wed Mar 23 20:47:11 2011 +0100
+
+    cciss: fix lost command issue
+    
+    commit 1ddd5049545e0aa1a0ed19bca4d9c9c3ce1ac8a2 upstream.
+    
+    Under certain workloads a command may seem to get lost. IOW, the Smart Array
+    thinks all commands have been completed but we still have commands in our
+    completion queue. This may lead to system instability, filesystems going
+    read-only, or even panics depending on the affected filesystem. We add an
+    extra read to force the write to complete.
+    
+    Testing shows this extra read avoids the problem.
+    
+    Signed-off-by: Mike Miller <mike.miller at hp.com>
+    Signed-off-by: Jens Axboe <jaxboe at fusionio.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
+index 24a7efa..2e5816c 100644
+--- a/drivers/block/cciss.h
++++ b/drivers/block/cciss.h
+@@ -157,6 +157,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c)
+ 	 printk("Sending %x - down to controller\n", c->busaddr );
+ #endif /* CCISS_DEBUG */ 
+          writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
++	readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
+ 	 h->commands_outstanding++;
+ 	 if ( h->commands_outstanding > h->max_outstanding)
+ 		h->max_outstanding = h->commands_outstanding;

Modified: dists/lenny/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:59:11 2011	(r17422)
+++ dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:59:17 2011	(r17423)
@@ -20,3 +20,4 @@
 + bugfix/all/md-fix-bug-with-re-adding-of-partially-recovered-device-regression.patch
 + bugfix/x86/flush-tlb-if-pgd-entry-is-changed-in-pae-mode.patch
 + bugfix/all/ext3-skip-orphan-cleanup-on-rocompat-fs.patch
++ bugfix/all/cciss-fix-lost-command-issue.patch