summaryrefslogtreecommitdiffstats
path: root/queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch
diff options
context:
space:
mode:
Diffstat (limited to 'queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch')
-rw-r--r--queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch b/queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch
new file mode 100644
index 0000000..b6e5b50
--- /dev/null
+++ b/queue/cciss-do-not-attempt-to-read-from-a-write-only-regis.patch
@@ -0,0 +1,34 @@
+From 00b698c79c8f3f667fef845e0271a1777da15b7a Mon Sep 17 00:00:00 2001
+From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
+Date: Sat, 9 Jul 2011 09:04:12 +0200
+Subject: [PATCH] cciss: do not attempt to read from a write-only register
+
+commit 07d0c38e7d84f911c72058a124c7f17b3c779a65 upstream.
+
+Most smartarrays will tolerate it, but some new ones don't.
+
+Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
+
+Note: this is a regression caused by commit 1ddd5049
+Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ drivers/block/cciss.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
+index 37a2d4f..759cbd9 100644
+--- a/drivers/block/cciss.h
++++ b/drivers/block/cciss.h
+@@ -173,7 +173,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);
++ readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
+ h->commands_outstanding++;
+ if ( h->commands_outstanding > h->max_outstanding)
+ h->max_outstanding = h->commands_outstanding;
+--
+1.7.9.6
+