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

scsi: ufs: Improve SCSI abort handling further 

Release resources when aborting a command. Make sure that aborted commands
are completed once by clearing the corresponding tag bit from
hba->outstanding_reqs. This patch is an improved version of commit
3ff1f6b6 ("scsi: ufs: core: Improve SCSI abort handling").

Link: https://lore.kernel.org/r/20211203231950.193369-14-bvanassche@acm.org


Fixes: 7a3e97b0 ("[SCSI] ufshcd: UFS Host controller driver")
Tested-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6f8dafde

drivers/scsi/ufs/ufshcd.c

+12 −0
Original line number Diff line number Diff line
@@ -6984,6 +6984,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) 
	struct ufshcd_lrb *lrbp = &hba->lrb[tag];

	unsigned long flags;

	int err = FAILED;

	bool outstanding;

	u32 reg;



	WARN_ONCE(tag < 0, "Invalid tag %d\n", tag);
@@ -7061,6 +7062,17 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) 
		goto release;

	}



	/*

	 * Clear the corresponding bit from outstanding_reqs since the command

	 * has been aborted successfully.

	 */

	spin_lock_irqsave(&hba->outstanding_lock, flags);

	outstanding = __test_and_clear_bit(tag, &hba->outstanding_reqs);

	spin_unlock_irqrestore(&hba->outstanding_lock, flags);



	if (outstanding)

		ufshcd_release_scsi_cmd(hba, lrbp);



	err = SUCCESS;



release: