Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33709c9a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: complete requests in host reset and restore path"

parents cfdc3af3 ddc64162

drivers/scsi/ufs/ufshcd.c

+9 −3
Original line number Diff line number Diff line
@@ -7075,8 +7075,8 @@ static void ufshcd_err_handler(struct work_struct *work) 


	/*

	 * if host reset is required then skip clearing the pending

	 * transfers forcefully because they will automatically get

	 * cleared after link startup.

	 * transfers forcefully because they will get cleared during

	 * host reset and restore

	 */

	if (needs_reset)

		goto skip_pending_xfer_clear;
@@ -7891,9 +7891,15 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) 
	int err;

	unsigned long flags;



	/* Reset the host controller */

	/*

	 * Stop the host controller and complete the requests

	 * cleared by h/w

	 */

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

	ufshcd_hba_stop(hba, false);

	hba->silence_err_logs = true;

	ufshcd_complete_requests(hba);

	hba->silence_err_logs = false;

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



	/* scale up clocks to max frequency before full reinitialization */