Commit 62c01537 authored by Peter Wang's avatar Peter Wang Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume 



Move the link recovery trigger from ufshcd_uic_pwr_ctrl() to
__ufshcd_wl_resume(). Ensure link recovery is only attempted when hibern8
exit fails during resume, not during hibern8 enter in suspend. Improve
error handling and prevent unnecessary link recovery attempts.

Fixes: 35dabf45 ("scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume")
Signed-off-by: default avatarPeter Wang <peter.wang@mediatek.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260223103906.2533654-1-peter.wang@mediatek.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 30df81f2

drivers/ufs/core/ufshcd.c

+9 −9
Original line number Diff line number Diff line
@@ -4390,14 +4390,6 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) 
	spin_unlock_irqrestore(hba->host->host_lock, flags);

	mutex_unlock(&hba->uic_cmd_mutex);



	/*

	 * If the h8 exit fails during the runtime resume process, it becomes

	 * stuck and cannot be recovered through the error handler.  To fix

	 * this, use link recovery instead of the error handler.

	 */

	if (ret && hba->pm_op_in_progress)

		ret = ufshcd_link_recovery(hba);



	return ret;

}
@@ -10200,6 +10192,14 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
		} else {

			dev_err(hba->dev, "%s: hibern8 exit failed %d\n",

					__func__, ret);

			/*

			 * If the h8 exit fails during the runtime resume

			 * process, it becomes stuck and cannot be recovered

			 * through the error handler. To fix this, use link

			 * recovery instead of the error handler.

			 */

			ret = ufshcd_link_recovery(hba);

			if (ret)

				goto vendor_suspend;

		}

	} else if (ufshcd_is_link_off(hba)) {