[SCSI] lpfc 8.3.36: Update DIF support for passthru/strip/insert

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

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index d7f3313ef886..624eab370396 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -8068,10 +8068,6 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                        LPFC_WQE_LENLOC_WORD4);
                 bf_set(wqe_ebde_cnt, &wqe->fcp_iwrite.wqe_com, 0);
                 bf_set(wqe_pu, &wqe->fcp_iwrite.wqe_com, iocbq->iocb.ulpPU);
-                if (iocbq->iocb_flag & LPFC_IO_DIF) {
-                        iocbq->iocb_flag &= ~LPFC_IO_DIF;
-                        bf_set(wqe_dif, &wqe->generic.wqe_com, 1);
-                }
                 bf_set(wqe_dbde, &wqe->fcp_iwrite.wqe_com, 1);
                 break;
         case CMD_FCP_IREAD64_CR:
@@ -8091,10 +8087,6 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                        LPFC_WQE_LENLOC_WORD4);
                 bf_set(wqe_ebde_cnt, &wqe->fcp_iread.wqe_com, 0);
                 bf_set(wqe_pu, &wqe->fcp_iread.wqe_com, iocbq->iocb.ulpPU);
-                if (iocbq->iocb_flag & LPFC_IO_DIF) {
-                        iocbq->iocb_flag &= ~LPFC_IO_DIF;
-                        bf_set(wqe_dif, &wqe->generic.wqe_com, 1);
-                }
                 bf_set(wqe_dbde, &wqe->fcp_iread.wqe_com, 1);
                 break;
         case CMD_FCP_ICMND64_CR:
@@ -8304,6 +8296,14 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                 break;
         }
 
+        if (iocbq->iocb_flag & LPFC_IO_DIF_PASS)
+                bf_set(wqe_dif, &wqe->generic.wqe_com, LPFC_WQE_DIF_PASSTHRU);
+        else if (iocbq->iocb_flag & LPFC_IO_DIF_STRIP)
+                bf_set(wqe_dif, &wqe->generic.wqe_com, LPFC_WQE_DIF_STRIP);
+        else if (iocbq->iocb_flag & LPFC_IO_DIF_INSERT)
+                bf_set(wqe_dif, &wqe->generic.wqe_com, LPFC_WQE_DIF_INSERT);
+        iocbq->iocb_flag &= ~(LPFC_IO_DIF_PASS | LPFC_IO_DIF_STRIP |
+                              LPFC_IO_DIF_INSERT);
         bf_set(wqe_xri_tag, &wqe->generic.wqe_com, xritag);
         bf_set(wqe_reqtag, &wqe->generic.wqe_com, iocbq->iotag);
         wqe->generic.wqe_com.abort_tag = abort_tag;