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

Commit e0116c91 authored by Steffen Maier's avatar Steffen Maier Committed by Martin K. Petersen
Browse files

scsi: zfcp: split FCP_CMND IU setup between SCSI I/O and TMF again 



This reverts commit 2443c8b2 ("[SCSI] zfcp: Merge FCP task management
setup with regular FCP command setup"), because this introduced a
dependency on the unsuitable SCSI command for scsi_eh / TMF.

Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 266883f2

drivers/s390/scsi/zfcp_fc.h

+14 −8
Original line number Diff line number Diff line
@@ -207,21 +207,14 @@ struct zfcp_fc_wka_ports { 
 * zfcp_fc_scsi_to_fcp - setup FCP command with data from scsi_cmnd

 * @fcp: fcp_cmnd to setup

 * @scsi: scsi_cmnd where to get LUN, task attributes/flags and CDB

 * @tm: task management flags to setup task management command

 */

static inline

void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,

			 u8 tm_flags)

void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi)

{

	u32 datalen;



	int_to_scsilun(scsi->device->lun, (struct scsi_lun *) &fcp->fc_lun);



	if (unlikely(tm_flags)) {

		fcp->fc_tm_flags = tm_flags;

		return;

	}



	fcp->fc_pri_ta = FCP_PTA_SIMPLE;



	if (scsi->sc_data_direction == DMA_FROM_DEVICE)
@@ -240,6 +233,19 @@ void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi, 
	}

}



/**

 * zfcp_fc_fcp_tm() - Setup FCP command as task management command.

 * @fcp: Pointer to FCP_CMND IU to set up.

 * @dev: Pointer to SCSI_device where to send the task management command.

 * @tm_flags: Task management flags to setup tm command.

 */

static inline

void zfcp_fc_fcp_tm(struct fcp_cmnd *fcp, struct scsi_device *dev, u8 tm_flags)

{

	int_to_scsilun(dev->lun, (struct scsi_lun *) &fcp->fc_lun);

	fcp->fc_tm_flags = tm_flags;

}



/**

 * zfcp_fc_evap_fcp_rsp - evaluate FCP RSP IU and update scsi_cmnd accordingly

 * @fcp_rsp: FCP RSP IU to evaluate

drivers/s390/scsi/zfcp_fsf.c

+2 −2
Original line number Diff line number Diff line
@@ -2260,7 +2260,7 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd) 


	BUILD_BUG_ON(sizeof(struct fcp_cmnd) > FSF_FCP_CMND_SIZE);

	fcp_cmnd = &req->qtcb->bottom.io.fcp_cmnd.iu;

	zfcp_fc_scsi_to_fcp(fcp_cmnd, scsi_cmnd, 0);

	zfcp_fc_scsi_to_fcp(fcp_cmnd, scsi_cmnd);



	if ((scsi_get_prot_op(scsi_cmnd) != SCSI_PROT_NORMAL) &&

	    scsi_prot_sg_count(scsi_cmnd)) {
@@ -2355,7 +2355,7 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, 
	zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);



	fcp_cmnd = &req->qtcb->bottom.io.fcp_cmnd.iu;

	zfcp_fc_scsi_to_fcp(fcp_cmnd, scmnd, tm_flags);

	zfcp_fc_fcp_tm(fcp_cmnd, scmnd->device, tm_flags);



	zfcp_fsf_start_timer(req, ZFCP_SCSI_ER_TIMEOUT);

	if (!zfcp_fsf_req_send(req))