Commit faac32d4 authored by Peter Wang's avatar Peter Wang Committed by Martin K. Petersen
Browse files

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



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: default avatarPeter Wang <peter.wang@mediatek.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 58636385

drivers/ufs/core/ufshcd.c

+2 −1
Original line number Diff line number Diff line
@@ -6446,13 +6446,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)

{

drivers/ufs/host/ufs-mediatek.c

+11 −3
Original line number Diff line number Diff line
@@ -1686,7 +1686,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;
@@ -1697,8 +1697,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,
@@ -1709,7 +1717,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;

	}

include/ufs/ufshcd.h

+1 −0
Original line number Diff line number Diff line
@@ -1508,5 +1508,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 */