scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume

[ Upstream commit 35dabf4503b94a697bababe94678a8bc989c3223 ]

If the h8 exit fails during runtime resume process, the runtime thread
enters runtime suspend immediately and the error handler operates at the
same time.  It becomes stuck and cannot be recovered through the error
handler.  To fix this, use link recovery instead of the error handler.

Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and other error recovery paths")
Signed-off-by: Seunghui Lee <sh043.lee@samsung.com>
Link: https://lore.kernel.org/r/20250717081213.6811-1-sh043.lee@samsung.com
Reviewed-by: Bean Huo <beanhuo@micron.com>
Acked-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 50adfb8b335bf48dee040e28d39099c6bbdcc508..f07878c50f142e0be65c4c4f7810f16539efa909 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -4340,7 +4340,7 @@ out:
        hba->uic_async_done = NULL;
        if (reenable_intr)
                ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
-       if (ret) {
+       if (ret && !hba->pm_op_in_progress) {
                ufshcd_set_link_broken(hba);
                ufshcd_schedule_eh_work(hba);
        }
@@ -4348,6 +4348,14 @@ out_unlock:
        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;
 }