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

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>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index acfc1b4691fa6cfbf6245409c0a23ccea02f5ed6..ad7cfdf0244f81b20ac598154d867223b71815cb 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -4383,7 +4383,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);
        }
@@ -4391,6 +4391,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;
 }