releases/3.0.1/cciss-do-not-attempt-to-read-from-a-write-only-register.patch

   1 From 07d0c38e7d84f911c72058a124c7f17b3c779a65 Mon Sep 17 00:00:00 2001
   2 From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
   3 Date: Sat, 9 Jul 2011 09:04:12 +0200
   4 Subject: cciss: do not attempt to read from a write-only register
   5
   6 From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
   7
   8 commit 07d0c38e7d84f911c72058a124c7f17b3c779a65 upstream.
   9
  10 Most smartarrays will tolerate it, but some new ones don't.
  11
  12 Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
  13
  14 Note: this is a regression caused by commit 1ddd5049
  15 Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17
  18 ---
  19  drivers/block/cciss.h |    2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 --- a/drivers/block/cciss.h
  23 +++ b/drivers/block/cciss.h
  24 @@ -223,7 +223,7 @@ static void SA5_submit_command( ctlr_inf
  25                         h->ctlr, c->busaddr);
  26  #endif /* CCISS_DEBUG */
  27           writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
  28 -       readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
  29 +       readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
  30          h->commands_outstanding++;
  31          if ( h->commands_outstanding > h->max_outstanding)
  32                 h->max_outstanding = h->commands_outstanding;