* [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume
@ 2026-02-23 10:37 peter.wang
2026-02-23 17:23 ` Bart Van Assche
2026-02-25 2:08 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: peter.wang @ 2026-02-23 10:37 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: wsd_upstream, linux-mediatek, peter.wang, chun-hung.wu,
alice.chao, cc.chou, chaotian.jing, tun-yu.yu, eddie.huang,
naomi.chu, ed.tsai, bvanassche, sh043.lee
From: Peter Wang <peter.wang@mediatek.com>
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: 35dabf4503b9 ("scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume")
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
---
drivers/ufs/core/ufshcd.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
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)) {
/*
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume
2026-02-23 10:37 [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume peter.wang
@ 2026-02-23 17:23 ` Bart Van Assche
2026-02-25 2:08 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Bart Van Assche @ 2026-02-23 17:23 UTC (permalink / raw)
To: peter.wang, linux-scsi, martin.petersen, avri.altman, alim.akhtar,
jejb
Cc: wsd_upstream, linux-mediatek, chun-hung.wu, alice.chao, cc.chou,
chaotian.jing, tun-yu.yu, eddie.huang, naomi.chu, ed.tsai,
sh043.lee
On 2/23/26 2:37 AM, peter.wang@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@acm.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume
2026-02-23 10:37 [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume peter.wang
2026-02-23 17:23 ` Bart Van Assche
@ 2026-02-25 2:08 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2026-02-25 2:08 UTC (permalink / raw)
To: linux-scsi, avri.altman, alim.akhtar, jejb, peter.wang
Cc: Martin K . Petersen, wsd_upstream, linux-mediatek, chun-hung.wu,
alice.chao, cc.chou, chaotian.jing, tun-yu.yu, eddie.huang,
naomi.chu, ed.tsai, bvanassche, sh043.lee
On Mon, 23 Feb 2026 18:37:57 +0800, peter.wang@mediatek.com wrote:
> 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.
>
>
> [...]
Applied to 7.0/scsi-fixes, thanks!
[1/1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume
https://git.kernel.org/mkp/scsi/c/62c015373e1c
--
Martin K. Petersen
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-25 2:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-23 10:37 [PATCH v1] ufs: core: Move link recovery for hibern8 exit failure to wl_resume peter.wang
2026-02-23 17:23 ` Bart Van Assche
2026-02-25 2:08 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox