scsi: ufs: host: mediatek: Enhance recovery on hibernation exit failure

[ Upstream commit faac32d4ece30609f1a0930ca0ae951cf6dc1786 ]

Improve the recovery process for hibernation exit failures. Trigger the
error handler and break the suspend operation to ensure effective
recovery from hibernation errors. Activate the error handling mechanism
by ufshcd_force_error_recovery and scheduling the error handler work.

Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Reviewed-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 52f2c599a348e9dd1051e7719f306f630bd026c9..8bb6c4821696307e458d7f423760ff7ce843ba52 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -6462,13 +6462,14 @@ void ufshcd_schedule_eh_work(struct ufs_hba *hba)
        }
 }
 
-static void ufshcd_force_error_recovery(struct ufs_hba *hba)
+void ufshcd_force_error_recovery(struct ufs_hba *hba)
 {
        spin_lock_irq(hba->host->host_lock);
        hba->force_reset = true;
        ufshcd_schedule_eh_work(hba);
        spin_unlock_irq(hba->host->host_lock);
 }
+EXPORT_SYMBOL_GPL(ufshcd_force_error_recovery);
 
 static void ufshcd_clk_scaling_allow(struct ufs_hba *hba, bool allow)
 {

diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 055b24758ca3d477f8b05f1f87babb36d7a00907..6bdbbee1f070887e8d5083619f3ed1d7f2446d73 100644 (file)
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -1646,7 +1646,7 @@ static void ufs_mtk_dev_vreg_set_lpm(struct ufs_hba *hba, bool lpm)
        }
 }
 
-static void ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)
+static int ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)
 {
        int ret;
 
@@ -1657,8 +1657,16 @@ static void ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)
        ufs_mtk_wait_idle_state(hba, 5);
 
        ret = ufs_mtk_wait_link_state(hba, VS_LINK_UP, 100);
-       if (ret)
+       if (ret) {
                dev_warn(hba->dev, "exit h8 state fail, ret=%d\n", ret);
+
+               ufshcd_force_error_recovery(hba);
+
+               /* trigger error handler and break suspend */
+               ret = -EBUSY;
+       }
+
+       return ret;
 }
 
 static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,
@@ -1669,7 +1677,7 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,
 
        if (status == PRE_CHANGE) {
                if (ufshcd_is_auto_hibern8_supported(hba))
-                       ufs_mtk_auto_hibern8_disable(hba);
+                       return ufs_mtk_auto_hibern8_disable(hba);
                return 0;
        }
 

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index a3fa98540d18452c25f1a07216532c22e258238d..a4eb5bde46e88bef9972e7feeacbe23a4ef31444 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1511,5 +1511,6 @@ int __ufshcd_write_ee_control(struct ufs_hba *hba, u32 ee_ctrl_mask);
 int ufshcd_write_ee_control(struct ufs_hba *hba);
 int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask,
                             const u16 *other_mask, u16 set, u16 clr);
+void ufshcd_force_error_recovery(struct ufs_hba *hba);
 
 #endif /* End of Header */