Commit 9bd3c204 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: 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 avatarJens Axboe <jaxboe@fusionio.com>
parent 490b94be

drivers/block/cciss.h

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

	}

}