public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
To: axboe@kernel.dk
Cc: mikem@beardog.cce.hp.com, akpm@linux-foundation.org,
	thenzl@redhat.com, linux-kernel@vger.kernel.org,
	smcameron@yahoo.com
Subject: [PATCH 01/16] cciss: add readl after writel in interrupt mask setting code
Date: Tue, 03 May 2011 14:52:54 -0500	[thread overview]
Message-ID: <20110503195254.5154.17753.stgit@beardog.cce.hp.com> (raw)
In-Reply-To: <20110503194919.5154.78352.stgit@beardog.cce.hp.com>

From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

This is to ensure the board interrupts are really off when
these functions return.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
---
 drivers/block/cciss.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 554bbd9..9b49439 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -239,11 +239,13 @@ static void SA5_intr_mask(ctlr_info_t *h, unsigned long val)
 	{ /* Turn interrupts on */
 		h->interrupts_enabled = 1;
 		writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
 	} else /* Turn them off */
 	{
 		h->interrupts_enabled = 0;
         	writel( SA5_INTR_OFF, 
 			h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
 	}
 }
 /*
@@ -257,11 +259,13 @@ static void SA5B_intr_mask(ctlr_info_t *h, unsigned long val)
         { /* Turn interrupts on */
 		h->interrupts_enabled = 1;
                 writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
         } else /* Turn them off */
         {
 		h->interrupts_enabled = 0;
                 writel( SA5B_INTR_OFF,
                         h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
         }
 }
 
@@ -271,10 +275,12 @@ static void SA5_performant_intr_mask(ctlr_info_t *h, unsigned long val)
 	if (val) { /* turn on interrupts */
 		h->interrupts_enabled = 1;
 		writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
 	} else {
 		h->interrupts_enabled = 0;
 		writel(SA5_PERF_INTR_OFF,
 				h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
 	}
 }
 


  reply	other threads:[~2011-05-03 19:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-03 19:52 [PATCH 00/16] cciss: May 3, 2011 updates Stephen M. Cameron
2011-05-03 19:52 ` Stephen M. Cameron [this message]
2011-05-03 19:53 ` [PATCH 02/16] cciss: do a better job of detecting controller reset failure Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 03/16] cciss: factor out command pool allocation functions Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 04/16] cciss: factor out scatterlist " Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 05/16] cciss: factor out irq request code Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 06/16] cciss: fix reply pool and block fetch table memory leaks Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 07/16] cciss: get rid of message related magic numbers Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 08/16] cciss: increase time to wait for board reset to start Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 09/16] cciss: clarify messages around reset behavior Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 10/16] cciss: increase timeouts for post-reset no-ops Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 11/16] cciss: use new doorbell-bit-5 reset method Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 12/16] cciss: do soft reset if hard reset is broken Stephen M. Cameron
2011-05-03 19:53 ` [PATCH 13/16] cciss: remove superfluous sleeps around reset code Stephen M. Cameron
2011-05-03 19:54 ` [PATCH 14/16] cciss: do not attempt PCI power management reset method if we know it won't work Stephen M. Cameron
2011-05-03 19:54 ` [PATCH 15/16] cciss: do not use bit 2 doorbell reset Stephen M. Cameron
2011-05-03 19:54 ` [PATCH 16/16] cciss: add cciss_tape_cmds module paramter Stephen M. Cameron
2011-05-06 14:29 ` [PATCH 00/16] cciss: May 3, 2011 updates Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110503195254.5154.17753.stgit@beardog.cce.hp.com \
    --to=scameron@beardog.cce.hp.com \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikem@beardog.cce.hp.com \
    --cc=smcameron@yahoo.com \
    --cc=thenzl@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox