Commit f1304d44 authored by Bao D. Nguyen's avatar Bao D. Nguyen Committed by Martin K. Petersen
Browse files

scsi: ufs: mcq: Added ufshcd_mcq_abort() 



Add ufshcd_mcq_abort() to support UFS abort in MCQ mode.

Signed-off-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Link: https://lore.kernel.org/r/c80c0adadf09ac1d909ed53b36d54737f62c2332.1685396241.git.quic_nguyenb@quicinc.com


Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Tested-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarCan Guo <quic_cang@quicinc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent adf45261

drivers/ufs/core/ufs-mcq.c

+60 −0
Original line number Diff line number Diff line
@@ -596,3 +596,63 @@ static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba, 
	mutex_unlock(&hwq->sq_mutex);

	return ret;

}



/**

 * ufshcd_mcq_abort - Abort the command in MCQ.

 * @cmd - The command to be aborted.

 *

 * Returns SUCCESS or FAILED error codes

 */

int ufshcd_mcq_abort(struct scsi_cmnd *cmd)

{

	struct Scsi_Host *host = cmd->device->host;

	struct ufs_hba *hba = shost_priv(host);

	int tag = scsi_cmd_to_rq(cmd)->tag;

	struct ufshcd_lrb *lrbp = &hba->lrb[tag];

	struct ufs_hw_queue *hwq;

	int err = FAILED;



	if (!ufshcd_cmd_inflight(lrbp->cmd)) {

		dev_err(hba->dev,

			"%s: skip abort. cmd at tag %d already completed.\n",

			__func__, tag);

		goto out;

	}



	/* Skip task abort in case previous aborts failed and report failure */

	if (lrbp->req_abort_skip) {

		dev_err(hba->dev, "%s: skip abort. tag %d failed earlier\n",

			__func__, tag);

		goto out;

	}



	hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));



	if (ufshcd_mcq_sqe_search(hba, hwq, tag)) {

		/*

		 * Failure. The command should not be "stuck" in SQ for

		 * a long time which resulted in command being aborted.

		 */

		dev_err(hba->dev, "%s: cmd found in sq. hwq=%d, tag=%d\n",

			__func__, hwq->id, tag);

		goto out;

	}



	/*

	 * The command is not in the submission queue, and it is not

	 * in the completion queue either. Query the device to see if

	 * the command is being processed in the device.

	 */

	if (ufshcd_try_to_abort_task(hba, tag)) {

		dev_err(hba->dev, "%s: device abort failed %d\n", __func__, err);

		lrbp->req_abort_skip = true;

		goto out;

	}



	err = SUCCESS;

	if (ufshcd_cmd_inflight(lrbp->cmd))

		ufshcd_release_scsi_cmd(hba, lrbp);



out:

	return err;

}

drivers/ufs/core/ufshcd-priv.h

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba, 


bool ufshcd_cmd_inflight(struct scsi_cmnd *cmd);

int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag);

int ufshcd_mcq_abort(struct scsi_cmnd *cmd);

int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag);

void ufshcd_release_scsi_cmd(struct ufs_hba *hba,

			     struct ufshcd_lrb *lrbp);



#define UFSHCD_MCQ_IO_QUEUE_OFFSET	1

#define SD_ASCII_STD true

drivers/ufs/core/ufshcd.c

+7 −5
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static int ufshcd_setup_hba_vreg(struct ufs_hba *hba, bool on); 
static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on);

static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,

					 struct ufs_vreg *vreg);

static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag);

static void ufshcd_wb_toggle_buf_flush_during_h8(struct ufs_hba *hba,

						 bool enable);

static void ufshcd_hba_vreg_set_lpm(struct ufs_hba *hba);
@@ -5450,7 +5449,7 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status) 
}



/* Release the resources allocated for processing a SCSI command. */

static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,

void ufshcd_release_scsi_cmd(struct ufs_hba *hba,

			     struct ufshcd_lrb *lrbp)

{

	struct scsi_cmnd *cmd = lrbp->cmd;
@@ -7389,7 +7388,7 @@ static void ufshcd_set_req_abort_skip(struct ufs_hba *hba, unsigned long bitmap) 
 *

 * Returns zero on success, non-zero on failure

 */

static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)

int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)

{

	struct ufshcd_lrb *lrbp = &hba->lrb[tag];

	int err = 0;
@@ -7552,8 +7551,11 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) 
		goto release;

	}



	if (is_mcq_enabled(hba))

	if (is_mcq_enabled(hba)) {

		/* MCQ mode. Branch off to handle abort for mcq mode */

		err = ufshcd_mcq_abort(cmd);

		goto release;

	}



	/* Skip task abort in case previous aborts failed and report failure */

	if (lrbp->req_abort_skip) {