The patch titled cciss: check for msi in interrupt_not_for_us has been added to the -mm tree. Its filename is cciss-check-for-msi-in-interrupt_not_for_us.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: check for msi in interrupt_not_for_us From: Mike Miller <mike.miller@xxxxxx> Check 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. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Cc: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/block/cciss.c~cciss-check-for-msi-in-interrupt_not_for_us drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-check-for-msi-in-interrupt_not_for_us +++ a/drivers/block/cciss.c @@ -3333,8 +3333,9 @@ static inline int interrupt_pending(ctlr 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, _ Patches currently in -mm which might be from mike.miller@xxxxxx are cciss-enqueue-and-submit-io.patch cciss-clean-up-interrupt-handler.patch cciss-check-for-msi-in-interrupt_not_for_us.patch cciss-make-interrupt-access-methods-return-type-bool.patch cciss-add-performant-mode-support-for-stars-sirius.patch cciss-new-controller-support-and-bump-driver-version.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html