diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-05-03 14:58:55 -0500 |
|---|---|---|
| committer | James Bottomley <jbottomley@parallels.com> | 2011-05-17 11:02:56 +0400 |
| commit | 8cd21da71c952843f9cc215436286cf7f991cc6e (patch) | |
| tree | f0afc1a52a9d5742bd8d0988408ba7cb0726e554 /drivers/scsi/hpsa.h | |
| parent | d0be5ec8693944c2e2fc0de70fda9dbc1b93bd7d (diff) | |
| download | op-kernel-dev-8cd21da71c952843f9cc215436286cf7f991cc6e.zip op-kernel-dev-8cd21da71c952843f9cc215436286cf7f991cc6e.tar.gz | |
[SCSI] hpsa: add readl after writel in interrupt mask setting code
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>
Signed-off-by: James Bottomley <jbottomley@parallels.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.h')
| -rw-r--r-- | drivers/scsi/hpsa.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index 98c97ca..7eec397 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -228,10 +228,12 @@ static void SA5_intr_mask(struct ctlr_info *h, unsigned long val) if (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); } } @@ -240,10 +242,12 @@ static void SA5_performant_intr_mask(struct ctlr_info *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); } } |
