Commit b817e6ff authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Introduce ufshcd_abort_all() 



Move the code for aborting all SCSI commands and TMFs into a new function.
This patch makes the ufshcd_err_handler() easier to read. Except for adding
more logging, this patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20221031183433.2443554-1-bvanassche@acm.org


Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 81cb3eb6

drivers/ufs/core/ufshcd.c

+34 −28
Original line number Diff line number Diff line
@@ -6161,6 +6161,38 @@ static bool ufshcd_is_pwr_mode_restore_needed(struct ufs_hba *hba) 
	return false;

}



static bool ufshcd_abort_all(struct ufs_hba *hba)

{

	bool needs_reset = false;

	int tag, ret;



	/* Clear pending transfer requests */

	for_each_set_bit(tag, &hba->outstanding_reqs, hba->nutrs) {

		ret = ufshcd_try_to_abort_task(hba, tag);

		dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag,

			hba->lrb[tag].cmd ? hba->lrb[tag].cmd->cmnd[0] : -1,

			ret ? "failed" : "succeeded");

		if (ret) {

			needs_reset = true;

			goto out;

		}

	}



	/* Clear pending task management requests */

	for_each_set_bit(tag, &hba->outstanding_tasks, hba->nutmrs) {

		if (ufshcd_clear_tm_cmd(hba, tag)) {

			needs_reset = true;

			goto out;

		}

	}



out:

	/* Complete the requests that are cleared by s/w */

	ufshcd_complete_requests(hba);



	return needs_reset;

}



/**

 * ufshcd_err_handler - handle UFS errors that require s/w attention

 * @work: pointer to work structure
@@ -6172,10 +6204,7 @@ static void ufshcd_err_handler(struct work_struct *work) 
	unsigned long flags;

	bool needs_restore;

	bool needs_reset;

	bool err_xfer;

	bool err_tm;

	int pmc_err;

	int tag;



	hba = container_of(work, struct ufs_hba, eh_work);
@@ -6204,8 +6233,6 @@ static void ufshcd_err_handler(struct work_struct *work) 
again:

	needs_restore = false;

	needs_reset = false;

	err_xfer = false;

	err_tm = false;



	if (hba->ufshcd_state != UFSHCD_STATE_ERROR)

		hba->ufshcd_state = UFSHCD_STATE_RESET;
@@ -6274,34 +6301,13 @@ static void ufshcd_err_handler(struct work_struct *work) 
	hba->silence_err_logs = true;

	/* release lock as clear command might sleep */

	spin_unlock_irqrestore(hba->host->host_lock, flags);

	/* Clear pending transfer requests */

	for_each_set_bit(tag, &hba->outstanding_reqs, hba->nutrs) {

		if (ufshcd_try_to_abort_task(hba, tag)) {

			err_xfer = true;

			goto lock_skip_pending_xfer_clear;

		}

		dev_err(hba->dev, "Aborted tag %d / CDB %#02x\n", tag,

			hba->lrb[tag].cmd ? hba->lrb[tag].cmd->cmnd[0] : -1);

	}



	/* Clear pending task management requests */

	for_each_set_bit(tag, &hba->outstanding_tasks, hba->nutmrs) {

		if (ufshcd_clear_tm_cmd(hba, tag)) {

			err_tm = true;

			goto lock_skip_pending_xfer_clear;

		}

	}



lock_skip_pending_xfer_clear:

	/* Complete the requests that are cleared by s/w */

	ufshcd_complete_requests(hba);

	needs_reset = ufshcd_abort_all(hba);



	spin_lock_irqsave(hba->host->host_lock, flags);

	hba->silence_err_logs = false;

	if (err_xfer || err_tm) {

		needs_reset = true;

	if (needs_reset)

		goto do_reset;

	}



	/*

	 * After all reqs and tasks are cleared from doorbell,