Commit 8cd21da7 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[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: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent d0be5ec8

drivers/scsi/hpsa.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

	}

}