Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c4042a4 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix dif and first burst use in write commands 



When dif and first burst is used in a write command wqe, the driver was not
properly setting fields in the io command request. This resulted in no dif
bytes being sent and invalid xfer_rdy's, resulting in the io being aborted
by the hardware.

Correct the wqe initializaton when both dif and first burst are used.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1165a5c2

drivers/scsi/lpfc/lpfc_scsi.c

+18 −0
Original line number Diff line number Diff line
@@ -2734,6 +2734,7 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, 
	int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;

	int prot_group_type = 0;

	int fcpdl;

	struct lpfc_vport *vport = phba->pport;



	/*

	 * Start the lpfc command prep by bumping the bpl beyond fcp_cmnd
@@ -2839,6 +2840,14 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, 
	 */

	iocb_cmd->un.fcpi.fcpi_parm = fcpdl;



	/*

	 * For First burst, we may need to adjust the initial transfer

	 * length for DIF

	 */

	if (iocb_cmd->un.fcpi.fcpi_XRdy &&

	    (fcpdl < vport->cfg_first_burst_size))

		iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl;



	return 0;

err:

	if (lpfc_cmd->seg_cnt)
@@ -3403,6 +3412,7 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, 
	int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;

	int prot_group_type = 0;

	int fcpdl;

	struct lpfc_vport *vport = phba->pport;



	/*

	 * Start the lpfc command prep by bumping the sgl beyond fcp_cmnd
@@ -3518,6 +3528,14 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, 
	 */

	iocb_cmd->un.fcpi.fcpi_parm = fcpdl;



	/*

	 * For First burst, we may need to adjust the initial transfer

	 * length for DIF

	 */

	if (iocb_cmd->un.fcpi.fcpi_XRdy &&

	    (fcpdl < vport->cfg_first_burst_size))

		iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl;



	/*

	 * If the OAS driver feature is enabled and the lun is enabled for

	 * OAS, set the oas iocb related flags.