[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20100528200311.GB6989@beardog.cce.hp.com>
Date: Fri, 28 May 2010 15:03:11 -0500
From: Mike Miller <mike.miller@...com>
To: Andrew Morton <akpm@...ux-foundation.org>,
Jens Axboe <jens.axboe@...cle.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
LKML-scsi <linux-scsi@...r.kernel.org>,
Steve Cameron <scameron@...rdog.cce.hp.com>
Subject: [PATCH 3/6] cciss: check for msi in interrupt_not_for_us
Patch 3 of 4
cciss: check for msi in interrupt_no_for_us
This patch checks to see if h->msi[x]_vector is set. We need this for a
following patch. Without this check we process one interrupt then stop
because in msi[x] mode the interrupt pending bit is not set. Not sure why we
didn't encounter this before.
From: Mike Miller <mike.miller@...com>
Cc: Stephen M. Cameron <scameron@...rdog.cce.hp.com>
Signed-off-by: Mike Miller <mike.miller@...com>
---
drivers/block/cciss.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index cae6a13..cd830cb 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3333,8 +3333,9 @@ static inline int interrupt_pending(ctlr_info_t *h)
static inline long interrupt_not_for_us(ctlr_info_t *h)
{
- return (((h->access.intr_pending(h) == 0) ||
- (h->interrupts_enabled == 0)));
+ return !(h->msi_vector || h->msix_vector) &&
+ ((h->access.intr_pending(h) == 0) ||
+ (h->interrupts_enabled == 0));
}
static inline int bad_tag(ctlr_info_t *h, u32 tag_index,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists