[SCSI] lpfc 8.1.12 : Misc bug fixes and code cleanup

Misc bug fixes and code cleanup:
 - Fix system hang while running on systems with IOMMU
 - Fix use after free issues with rports
 - Don't free mailbox structure if it's still on the mboxq list
 - Decrement txq_cnt rather than txcmplq_cnt when parsing the txq list
 - Use msleep for long delays to prevent soft lockup bug check
 - Don't remove node during dev_loss_tmo if discovery is active
 - Fix memory leaks in get/reset statistics and link attention paths
 - Fixed lpfc_ns_rsp to handle entire GID_FT response.
 - mbox interface should use MAILBOX_CMD_SIZE rather than sizeof(MAILBOX_t)
 - Fixed bug check in add_timer.
 - Fixup messages 0116, 0117, and 0128 to report ELS I/O tag.
 - Remove unused parameter to lpfc_cleanup.
 - Change mailbox timeout handling.
 - Remove unused buflist. Code cleanup.

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index a5f33a0dd4e7..e1c61dbb3d0f 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -222,16 +222,16 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba, uint8_t expectRsp,
                 /* Xmit ELS command <elsCmd> to remote NPORT <did> */
                 lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
                                 "%d:0116 Xmit ELS command x%x to remote "
-                                "NPORT x%x Data: x%x x%x\n",
+                                "NPORT x%x I/O tag: x%x, HBA state: x%x\n",
                                 phba->brd_no, elscmd,
-                                did, icmd->ulpIoTag, phba->hba_state);
+                                did, elsiocb->iotag, phba->hba_state);
         } else {
                 /* Xmit ELS response <elsCmd> to remote NPORT <did> */
                 lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
                                 "%d:0117 Xmit ELS response x%x to remote "
-                                "NPORT x%x Data: x%x x%x\n",
+                                "NPORT x%x I/O tag: x%x, size: x%x\n",
                                 phba->brd_no, elscmd,
-                                ndlp->nlp_DID, icmd->ulpIoTag, cmdSize);
+                                ndlp->nlp_DID, elsiocb->iotag, cmdSize);
         }
 
         return elsiocb;
@@ -2017,10 +2017,9 @@ lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
 
         /* Xmit ELS ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0128 Xmit ELS ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0128 Xmit ELS ACC response tag x%x, XRI: x%x, "
+                        "DID: x%x, nlp_flag: x%x nlp_state: x%x RPI: x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
@@ -3363,7 +3362,7 @@ lpfc_els_flush_cmd(struct lpfc_hba * phba)
                 els_command = *elscmd;
 
                 list_del(&piocb->list);
-                pring->txcmplq_cnt--;
+                pring->txq_cnt--;
 
                 cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
                 cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;