Commit 1cca0c3f authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove a redundant command completion logic in error handler 

ufshcd_host_reset_and_restore() anyways completes all pending requests
before starts re-probing, so there is no need to complete the command on
the highest bit in tr_doorbell in advance.

Link: https://lore.kernel.org/r/1621845419-14194-2-git-send-email-cang@codeaurora.org


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 80927822

drivers/scsi/ufs/ufshcd.c

+0 −13
Original line number Diff line number Diff line
@@ -6124,19 +6124,6 @@ static void ufshcd_err_handler(struct work_struct *work) 
do_reset:

	/* Fatal errors need reset */

	if (needs_reset) {

		unsigned long max_doorbells = (1UL << hba->nutrs) - 1;



		/*

		 * ufshcd_reset_and_restore() does the link reinitialization

		 * which will need atleast one empty doorbell slot to send the

		 * device management commands (NOP and query commands).

		 * If there is no slot empty at this moment then free up last

		 * slot forcefully.

		 */

		if (hba->outstanding_reqs == max_doorbells)

			__ufshcd_transfer_req_compl(hba,

						    (1UL << (hba->nutrs - 1)));



		hba->force_reset = false;

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

		err = ufshcd_reset_and_restore(hba);