| From e27f05147bff21408c1b8410ad8e90cd286e7952 Mon Sep 17 00:00:00 2001 |
| From: James Smart <jsmart2021@gmail.com> |
| Date: Fri, 3 Jun 2022 10:43:23 -0700 |
| Subject: scsi: lpfc: Resolve some cleanup issues following SLI path refactoring |
| |
| From: James Smart <jsmart2021@gmail.com> |
| |
| commit e27f05147bff21408c1b8410ad8e90cd286e7952 upstream. |
| |
| Following refactoring and consolidation in SLI processing, fix up some |
| minor issues related to SLI path: |
| |
| - Correct the setting of LPFC_EXCHANGE_BUSY flag in response IOCB. |
| |
| - Fix some typographical errors. |
| |
| - Fix duplicate log messages. |
| |
| Link: https://lore.kernel.org/r/20220603174329.63777-4-jsmart2021@gmail.com |
| Fixes: 1b64aa9eae28 ("scsi: lpfc: SLI path split: Refactor fast and slow paths to native SLI4") |
| Cc: <stable@vger.kernel.org> # v5.18 |
| Co-developed-by: Justin Tee <justin.tee@broadcom.com> |
| Signed-off-by: Justin Tee <justin.tee@broadcom.com> |
| Signed-off-by: James Smart <jsmart2021@gmail.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/scsi/lpfc/lpfc_init.c | 2 +- |
| drivers/scsi/lpfc/lpfc_sli.c | 25 ++++++++++++------------- |
| 2 files changed, 13 insertions(+), 14 deletions(-) |
| |
| --- a/drivers/scsi/lpfc/lpfc_init.c |
| +++ b/drivers/scsi/lpfc/lpfc_init.c |
| @@ -12063,7 +12063,7 @@ lpfc_sli_enable_msi(struct lpfc_hba *phb |
| rc = pci_enable_msi(phba->pcidev); |
| if (!rc) |
| lpfc_printf_log(phba, KERN_INFO, LOG_INIT, |
| - "0462 PCI enable MSI mode success.\n"); |
| + "0012 PCI enable MSI mode success.\n"); |
| else { |
| lpfc_printf_log(phba, KERN_INFO, LOG_INIT, |
| "0471 PCI enable MSI mode failed (%d)\n", rc); |
| --- a/drivers/scsi/lpfc/lpfc_sli.c |
| +++ b/drivers/scsi/lpfc/lpfc_sli.c |
| @@ -1930,7 +1930,7 @@ lpfc_issue_cmf_sync_wqe(struct lpfc_hba |
| sync_buf = __lpfc_sli_get_iocbq(phba); |
| if (!sync_buf) { |
| lpfc_printf_log(phba, KERN_ERR, LOG_CGN_MGMT, |
| - "6213 No available WQEs for CMF_SYNC_WQE\n"); |
| + "6244 No available WQEs for CMF_SYNC_WQE\n"); |
| ret_val = ENOMEM; |
| goto out_unlock; |
| } |
| @@ -3816,7 +3816,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hb |
| set_job_ulpword4(cmdiocbp, |
| IOERR_ABORT_REQUESTED); |
| /* |
| - * For SLI4, irsiocb contains |
| + * For SLI4, irspiocb contains |
| * NO_XRI in sli_xritag, it |
| * shall not affect releasing |
| * sgl (xri) process. |
| @@ -3834,7 +3834,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hb |
| } |
| } |
| } |
| - (cmdiocbp->cmd_cmpl) (phba, cmdiocbp, saveq); |
| + cmdiocbp->cmd_cmpl(phba, cmdiocbp, saveq); |
| } else |
| lpfc_sli_release_iocbq(phba, cmdiocbp); |
| } else { |
| @@ -4074,8 +4074,7 @@ lpfc_sli_handle_fast_ring_event(struct l |
| cmdiocbq->cmd_flag &= ~LPFC_DRIVER_ABORTED; |
| if (cmdiocbq->cmd_cmpl) { |
| spin_unlock_irqrestore(&phba->hbalock, iflag); |
| - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, |
| - &rspiocbq); |
| + cmdiocbq->cmd_cmpl(phba, cmdiocbq, &rspiocbq); |
| spin_lock_irqsave(&phba->hbalock, iflag); |
| } |
| break; |
| @@ -10304,7 +10303,7 @@ __lpfc_sli_issue_iocb_s3(struct lpfc_hba |
| * @flag: Flag indicating if this command can be put into txq. |
| * |
| * __lpfc_sli_issue_fcp_io_s3 is wrapper function to invoke lockless func to |
| - * send an iocb command to an HBA with SLI-4 interface spec. |
| + * send an iocb command to an HBA with SLI-3 interface spec. |
| * |
| * This function takes the hbalock before invoking the lockless version. |
| * The function will return success after it successfully submit the wqe to |
| @@ -12741,7 +12740,7 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba |
| cmdiocbq->cmd_cmpl = cmdiocbq->wait_cmd_cmpl; |
| cmdiocbq->wait_cmd_cmpl = NULL; |
| if (cmdiocbq->cmd_cmpl) |
| - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, NULL); |
| + cmdiocbq->cmd_cmpl(phba, cmdiocbq, NULL); |
| else |
| lpfc_sli_release_iocbq(phba, cmdiocbq); |
| return; |
| @@ -12755,9 +12754,9 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba |
| |
| /* Set the exchange busy flag for task management commands */ |
| if ((cmdiocbq->cmd_flag & LPFC_IO_FCP) && |
| - !(cmdiocbq->cmd_flag & LPFC_IO_LIBDFC)) { |
| + !(cmdiocbq->cmd_flag & LPFC_IO_LIBDFC)) { |
| lpfc_cmd = container_of(cmdiocbq, struct lpfc_io_buf, |
| - cur_iocbq); |
| + cur_iocbq); |
| if (rspiocbq && (rspiocbq->cmd_flag & LPFC_EXCHANGE_BUSY)) |
| lpfc_cmd->flags |= LPFC_SBUF_XBUSY; |
| else |
| @@ -13897,7 +13896,7 @@ void lpfc_sli4_els_xri_abort_event_proc( |
| * @irspiocbq: Pointer to work-queue completion queue entry. |
| * |
| * This routine handles an ELS work-queue completion event and construct |
| - * a pseudo response ELS IODBQ from the SLI4 ELS WCQE for the common |
| + * a pseudo response ELS IOCBQ from the SLI4 ELS WCQE for the common |
| * discovery engine to handle. |
| * |
| * Return: Pointer to the receive IOCBQ, NULL otherwise. |
| @@ -13941,7 +13940,7 @@ lpfc_sli4_els_preprocess_rspiocbq(struct |
| |
| if (bf_get(lpfc_wcqe_c_xb, wcqe)) { |
| spin_lock_irqsave(&phba->hbalock, iflags); |
| - cmdiocbq->cmd_flag |= LPFC_EXCHANGE_BUSY; |
| + irspiocbq->cmd_flag |= LPFC_EXCHANGE_BUSY; |
| spin_unlock_irqrestore(&phba->hbalock, iflags); |
| } |
| |
| @@ -14800,7 +14799,7 @@ lpfc_sli4_fp_handle_fcp_wcqe(struct lpfc |
| /* Pass the cmd_iocb and the wcqe to the upper layer */ |
| memcpy(&cmdiocbq->wcqe_cmpl, wcqe, |
| sizeof(struct lpfc_wcqe_complete)); |
| - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, cmdiocbq); |
| + cmdiocbq->cmd_cmpl(phba, cmdiocbq, cmdiocbq); |
| } else { |
| lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, |
| "0375 FCP cmdiocb not callback function " |
| @@ -18963,7 +18962,7 @@ lpfc_sli4_send_seq_to_ulp(struct lpfc_vp |
| |
| /* Free iocb created in lpfc_prep_seq */ |
| list_for_each_entry_safe(curr_iocb, next_iocb, |
| - &iocbq->list, list) { |
| + &iocbq->list, list) { |
| list_del_init(&curr_iocb->list); |
| lpfc_sli_release_iocbq(phba, curr_iocb); |
| } |
