Commit 8bb2dde0 authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

scsi: ufs: Properly release resources if a task is aborted successfully 

In current UFS task abort hook, namely ufshcd_abort(), if one task is
aborted successfully, clk_gating.active_reqs held by this task is not
decreased, which makes clk_gating.active_reqs stay above zero forever, thus
clock gating would never happen. Instead of releasing resources of one task
"manually", use the existing func __ufshcd_transfer_req_compl().  This
change also eliminates a possible race of scsi_dma_unmap() from the real
completion in IRQ handler path.

Link: https://lore.kernel.org/r/1596975355-39813-10-git-send-email-cang@codeaurora.org


Fixes: 1ab27c9c ("ufs: Add support for clock gating")
CC: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5586dd8e

drivers/scsi/ufs/ufshcd.c

+1 −4
Original line number Diff line number Diff line
@@ -6636,11 +6636,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) 
		goto out;

	}



	scsi_dma_unmap(cmd);



	spin_lock_irqsave(host->host_lock, flags);

	ufshcd_outstanding_req_clear(hba, tag);

	hba->lrb[tag].cmd = NULL;

	__ufshcd_transfer_req_compl(hba, (1UL << tag));

	spin_unlock_irqrestore(host->host_lock, flags);



out: