[PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume

[Bart Van Assche]

On 2/23/26 2:37 AM, peter.wang at mediatek.com wrote:
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index 44efb03765b9..9908375b2f98 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -4385,14 +4385,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;
>   }
>   
> @@ -10175,7 +10167,15 @@ 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);
> -			goto vendor_suspend;
> +			/*
> +			 * 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)) {
>   		/*

Reviewed-by: Bart Van Assche <bvanassche at acm.org>