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

Commit c47b4012 authored by Eddie Wai's avatar Eddie Wai Committed by James Bottomley
Browse files

[SCSI] bxn2i: Added support for other TMFs besides ABORT_TASK 



Expanded the TMF request routine to support other TMFs such as LUN
RESET, etc.

Signed-off-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Reviewed-by: default avatarAnil Veerabhadrappa <anilgv@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 39304072

drivers/scsi/bnx2i/bnx2i_hwi.c

+30 −28
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn, 
	struct bnx2i_cmd *bnx2i_cmd;

	struct bnx2i_tmf_request *tmfabort_wqe;

	u32 dword;

	u32 scsi_lun[2];



	bnx2i_cmd = (struct bnx2i_cmd *)mtask->dd_data;

	tmfabort_hdr = (struct iscsi_tm *)mtask->hdr;
@@ -393,38 +392,41 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn, 
						bnx2i_conn->ep->qp.sq_prod_qe;



	tmfabort_wqe->op_code = tmfabort_hdr->opcode;

	tmfabort_wqe->op_attr = 0;

	tmfabort_wqe->op_attr =

		ISCSI_TMF_REQUEST_ALWAYS_ONE | ISCSI_TM_FUNC_ABORT_TASK;

	tmfabort_wqe->op_attr = tmfabort_hdr->flags;



	tmfabort_wqe->itt = (mtask->itt | (ISCSI_TASK_TYPE_MPATH << 14));

	tmfabort_wqe->reserved2 = 0;

	tmfabort_wqe->cmd_sn = be32_to_cpu(tmfabort_hdr->cmdsn);



	switch (tmfabort_hdr->flags & ISCSI_FLAG_TM_FUNC_MASK) {

	case ISCSI_TM_FUNC_ABORT_TASK:

	case ISCSI_TM_FUNC_TASK_REASSIGN:

		ctask = iscsi_itt_to_task(conn, tmfabort_hdr->rtt);

		if (!ctask || !ctask->sc)

			/*

		 * the iscsi layer must have completed the cmd while this

			 * the iscsi layer must have completed the cmd while

			 * was starting up.

			 *

		 * Note: In the case of a SCSI cmd timeout, the task's sc

		 *       is still active; hence ctask->sc != 0

			 * Note: In the case of a SCSI cmd timeout, the task's

			 *       sc is still active; hence ctask->sc != 0

			 *       In this case, the task must be aborted

			 */

			return 0;



		ref_sc = ctask->sc;



	/* Retrieve LUN directly from the ref_sc */

	int_to_scsilun(ref_sc->device->lun, (struct scsi_lun *) scsi_lun);

	tmfabort_wqe->lun[0] = be32_to_cpu(scsi_lun[0]);

	tmfabort_wqe->lun[1] = be32_to_cpu(scsi_lun[1]);



		if (ref_sc->sc_data_direction == DMA_TO_DEVICE)

		dword = (ISCSI_TASK_TYPE_WRITE << ISCSI_CMD_REQUEST_TYPE_SHIFT);

			dword = (ISCSI_TASK_TYPE_WRITE <<

				 ISCSI_CMD_REQUEST_TYPE_SHIFT);

		else

		dword = (ISCSI_TASK_TYPE_READ << ISCSI_CMD_REQUEST_TYPE_SHIFT);

	tmfabort_wqe->ref_itt = (dword | (tmfabort_hdr->rtt & ISCSI_ITT_MASK));

			dword = (ISCSI_TASK_TYPE_READ <<

				 ISCSI_CMD_REQUEST_TYPE_SHIFT);

		tmfabort_wqe->ref_itt = (dword |

					(tmfabort_hdr->rtt & ISCSI_ITT_MASK));

		break;

	default:

		tmfabort_wqe->ref_itt = RESERVED_ITT;

	}

	memcpy(tmfabort_wqe->lun, tmfabort_hdr->lun, sizeof(struct scsi_lun));

	tmfabort_wqe->ref_cmd_sn = be32_to_cpu(tmfabort_hdr->refcmdsn);



	tmfabort_wqe->bd_list_addr_lo = (u32) bnx2i_conn->hba->mp_bd_dma;