[SCSI] lpfc 8.3.32: Fix CQ and EQ dump failure for debugfs

Fixed debug helper routine failed to dump CQ and EQ entries in non-MSI-X mode

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h
index 616c400dae14ae028c4e14f1dabda83d79e49da9..afe368fd1b98f31e59eae497d2daea9579df0c92 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_debugfs.h
+++ b/drivers/scsi/lpfc/lpfc_debugfs.h
@@ -395,8 +395,13 @@ lpfc_debug_dump_fcp_cq(struct lpfc_hba *phba, int fcp_wqidx)
        for (fcp_cqidx = 0; fcp_cqidx < phba->cfg_fcp_eq_count; fcp_cqidx++)
                if (phba->sli4_hba.fcp_cq[fcp_cqidx]->queue_id == fcp_cqid)
                        break;
-       if (fcp_cqidx >= phba->cfg_fcp_eq_count)
-               return;
+       if (phba->intr_type == MSIX) {
+               if (fcp_cqidx >= phba->cfg_fcp_eq_count)
+                       return;
+       } else {
+               if (fcp_cqidx > 0)
+                       return;
+       }
 
        printk(KERN_ERR "FCP CQ: WQ[Idx:%d|Qid%d]->CQ[Idx%d|Qid%d]:\n",
                fcp_wqidx, phba->sli4_hba.fcp_wq[fcp_wqidx]->queue_id,
@@ -426,8 +431,13 @@ lpfc_debug_dump_fcp_eq(struct lpfc_hba *phba, int fcp_wqidx)
        for (fcp_cqidx = 0; fcp_cqidx < phba->cfg_fcp_eq_count; fcp_cqidx++)
                if (phba->sli4_hba.fcp_cq[fcp_cqidx]->queue_id == fcp_cqid)
                        break;
-       if (fcp_cqidx >= phba->cfg_fcp_eq_count)
-               return;
+       if (phba->intr_type == MSIX) {
+               if (fcp_cqidx >= phba->cfg_fcp_eq_count)
+                       return;
+       } else {
+               if (fcp_cqidx > 0)
+                       return;
+       }
 
        if (phba->cfg_fcp_eq_count == 0) {
                fcp_eqidx = -1;