ufs: host: mediatek: Power Management and Stability Enhancements
Subsystems (4)
[email protected]
maintainerv3 cover ufs: host: mediatek: Power Management and Stability Enhancements
From: Peter Wang <[email protected]>
Enhance the UFS host driver's reliability, power management efficiency, and error recovery mechanisms on MediaTek platforms. Address critical issues and introduce optimizations to improve system stability and performance.
Changes since v2:
1. Change commit message to imperative mood
Changes since v1:
1. Export ufshcd_force_error_recovery instead use force_reset
ufs: host: mediatek: Enhance recovery on hibernation exit failure
Peter Wang (7):
ufs: host: mediatek: Enhance recovery on hibernation exit failure
ufs: host: mediatek: Enhance recovery on resume failure
ufs: host: mediatek: Correct system PM flow
ufs: host: mediatek: Support UFS PHY runtime PM and correct sequence
ufs: host: mediatek: Disable auto-hibern8 during power mode changes
ufs: host: mediatek: Fix unbalanced IRQ enable issue
ufs: host: mediatek: Fix device power control
Alice Chao (2):
ufs: host: mediatek: Correct resume flow for LPM and MTCMOS
ufs: host: mediatek: Fix adapt issue after PA_Init
Sanjeev Y (1):
ufs: host: mediatek: Return error directly on idle wait timeout
drivers/ufs/core/ufshcd.c | 3 +- drivers/ufs/host/ufs-mediatek.c | 171 ++++++++++++++++++++++++++------ drivers/ufs/host/ufs-mediatek.h | 1 + include/ufs/ufshcd.h | 1 + 4 files changed, 145 insertions(+), 31 deletions(-)
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 1/10 ufs: host: mediatek: Enhance recovery on hibernation exit failure
From: Peter Wang <[email protected]>
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.
--- drivers/ufs/core/ufshcd.c | 3 ++- drivers/ufs/host/ufs-mediatek.c | 14 +++++++++++--- include/ufs/ufshcd.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-)
drivers/ufs/core/ufshcd.c +2 -1
@@ -6410,13 +6410,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
@@ -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
@@ -1507,5 +1507,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 */
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 2/10 ufs: host: mediatek: Enhance recovery on resume failure
In reply to [email protected]From: Peter Wang <[email protected]>
Improve the recovery process for failed resume operations. Log the device's power status and return 0 if both resume and recovery fail to prevent I/O hang.
--- drivers/ufs/host/ufs-mediatek.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ufs/host/ufs-mediatek.c +14 -1
@@ -1775,8 +1775,21 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) }return 0 ; + fail: -return ufshcd_link_recovery (hba); +/* +* Check if the platform (parent) device has resumed, and ensure that +* power, clock, and MTCMOS are all turned on. +*/ + err =ufshcd_link_recovery (hba); +if (err) { +dev_err (hba->dev,"Device PM: req=%d, status:%d, err:%d\n" , + hba->dev->power.request, + hba->dev->power.runtime_status, + hba->dev->power.runtime_error); + } + +return 0 ;/* Cannot return a failure, otherwise, the I/O will hang. */ }static void ufs_mtk_dbg_register_dump (struct ufs_hba *hba)
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 3/10 ufs: host: mediatek: Correct system PM flow
In reply to [email protected]From: Peter Wang <[email protected]>
Refine the system power management (PM) flow by skipping low power mode (LPM) and MTCMOS settings if runtime PM is already applied. Prevent redundant operations to ensure a more efficient PM process.
--- drivers/ufs/host/ufs-mediatek.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/ufs/host/ufs-mediatek.c +14 -3
@@ -2304,27 +2304,38 @@ static int ufs_mtk_system_suspend(struct device *dev) ret =ufshcd_system_suspend (dev);if (ret) -return ret; + goto out; + +if (pm_runtime_suspended (hba->dev)) + goto out;ufs_mtk_dev_vreg_set_lpm (hba, true);if (ufs_mtk_is_rtff_mtcmos (hba))ufs_mtk_mtcmos_ctrl (false, res); - return 0; +out: + return ret; }static int ufs_mtk_system_resume (struct device *dev) { +int ret =0 ;struct ufs_hba *hba =dev_get_drvdata (dev);struct arm_smccc_res res; +if (pm_runtime_suspended (hba->dev)) + goto out; +ufs_mtk_dev_vreg_set_lpm (hba, false);if (ufs_mtk_is_rtff_mtcmos (hba))ufs_mtk_mtcmos_ctrl (true, res); -return ufshcd_system_resume (dev); +out: + ret =ufshcd_system_resume (dev); + +return ret; }#endif
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 4/10 ufs: host: mediatek: Correct resume flow for LPM and MTCMOS
In reply to [email protected]From: Alice Chao <[email protected]>
Correct the system resume flow by turning MTCMOS on before setting LPM to false. During system suspend, set LPM to true and turn MTCMOS off. Ensure proper power management and system stability with the updated resume sequence.
--- drivers/ufs/host/ufs-mediatek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-mediatek.c +2 -2
@@ -2327,11 +2327,11 @@ static int ufs_mtk_system_resume(struct device *dev)if (pm_runtime_suspended (hba->dev)) goto out; -ufs_mtk_dev_vreg_set_lpm (hba, false); -if (ufs_mtk_is_rtff_mtcmos (hba))ufs_mtk_mtcmos_ctrl (true, res); +ufs_mtk_dev_vreg_set_lpm (hba, false); + out: ret =ufshcd_system_resume (dev);
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 5/10 ufs: host: mediatek: Support UFS PHY runtime PM and correct sequence
In reply to [email protected]From: Peter Wang <[email protected]>
Add support for UFS PHY runtime power management by probing the PHY device and enabling its runtime PM. Ensure the correct sequence of operations during suspend and resume:
PHY suspend -> UFS suspend -> UFS resume -> PHY resume. Improve power management efficiency and system stability with this enhancement.
--- drivers/ufs/host/ufs-mediatek.c | 53 +++++++++++++++++++++++++++++---- drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 48 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-mediatek.c +47 -6
@@ -2243,10 +2243,12 @@ static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = {static int ufs_mtk_probe (struct platform_device *pdev) {int err; -struct device *dev = &pdev->dev; -struct device_node *reset_node; -struct platform_device *reset_pdev; +struct device *dev = &pdev->dev, *phy_dev =NULL ; +struct device_node *reset_node, *phy_node =NULL ; +struct platform_device *reset_pdev, *phy_pdev =NULL ;struct device_link *link; +struct ufs_hba *hba; +struct ufs_mtk_host *host; reset_node =of_find_compatible_node (NULL ,NULL ,"ti,syscon-reset" );
@@ -2273,13 +2275,44 @@ static int ufs_mtk_probe(struct platform_device *pdev) } skip_reset: +/* find phy node */ + phy_node =of_parse_phandle (dev->of_node,"phys" ,0 ); + +if (phy_node) { + phy_pdev =of_find_device_by_node (phy_node); +if (!phy_pdev) + goto skip_phy; + phy_dev = &phy_pdev->dev; + +pm_runtime_set_active (phy_dev); +pm_runtime_enable (phy_dev); +pm_runtime_get_sync (phy_dev); + +put_device (phy_dev); +dev_info (dev,"phys node found\n" ); + }else { +dev_notice (dev,"phys node not found\n" ); + } + +skip_phy:/* perform generic probe */ err =ufshcd_pltfrm_init (pdev, &ufs_hba_mtk_vops); - -out: -if (err) +if (err) {dev_err (dev,"probe failed %d\n" , err); + goto out; + } + + hba =platform_get_drvdata (pdev); +if (!hba) + goto out; + +if (phy_node && phy_dev) { + host =ufshcd_get_variant (hba); + host->phy_dev = phy_dev; + } +out: +of_node_put (phy_node);of_node_put (reset_node);return err; }
@@ -2343,6 +2376,7 @@ static int ufs_mtk_system_resume(struct device *dev)static int ufs_mtk_runtime_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct ufs_mtk_host *host =ufshcd_get_variant (hba);struct arm_smccc_res res;int ret =0 ;
@@ -2355,17 +2389,24 @@ static int ufs_mtk_runtime_suspend(struct device *dev)if (ufs_mtk_is_rtff_mtcmos (hba))ufs_mtk_mtcmos_ctrl (false, res); +if (host->phy_dev) +pm_runtime_put_sync (host->phy_dev); +return 0 ; }static int ufs_mtk_runtime_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev); +struct ufs_mtk_host *host =ufshcd_get_variant (hba);struct arm_smccc_res res;if (ufs_mtk_is_rtff_mtcmos (hba))ufs_mtk_mtcmos_ctrl (true, res); +if (host->phy_dev) +pm_runtime_get_sync (host->phy_dev); +ufs_mtk_dev_vreg_set_lpm (hba, false);return ufshcd_runtime_resume (dev);
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -193,6 +193,7 @@ struct ufs_mtk_host {bool is_mcq_intr_enabled;int mcq_nr_intr;struct ufs_mtk_mcq_intr_info mcq_intr_info[UFSHCD_MAX_Q_NR ]; +struct device *phy_dev; };/* MTK delay of autosuspend: 500 ms */
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 6/10 ufs: host: mediatek: Disable auto-hibern8 during power mode changes
In reply to [email protected]From: Peter Wang <[email protected]>
Disable auto-hibern8 during power mode transitions to prevent unintended entry into auto-hibern8. Restore the original auto-hibern8 timer value after completing the power mode change to maintain system stability and prevent potential issues during power state transitions.
--- drivers/ufs/host/ufs-mediatek.c | 53 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 23 deletions(-)
drivers/ufs/host/ufs-mediatek.c +30 -23
@@ -1429,19 +1429,49 @@ static int ufs_mtk_pre_pwr_change(struct ufs_hba *hba,return ret; } +static int ufs_mtk_auto_hibern8_disable (struct ufs_hba *hba) +{ +int ret; + +/* disable auto-hibern8 */ +ufshcd_writel (hba,0 ,REG_AUTO_HIBERNATE_IDLE_TIMER ); + +/* wait host return to idle state when auto-hibern8 off */ +ufs_mtk_wait_idle_state (hba,5 ); + + ret =ufs_mtk_wait_link_state (hba,VS_LINK_UP ,100 ); +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_pwr_change_notify (struct ufs_hba *hba,enum ufs_notify_change_status stage,const struct ufs_pa_layer_attr *dev_max_params,struct ufs_pa_layer_attr *dev_req_params) {int ret =0 ; +static u32 reg;switch (stage) {case PRE_CHANGE : +if (ufshcd_is_auto_hibern8_supported (hba)) { + reg =ufshcd_readl (hba,REG_AUTO_HIBERNATE_IDLE_TIMER ); +ufs_mtk_auto_hibern8_disable (hba); + } ret =ufs_mtk_pre_pwr_change (hba, dev_max_params, dev_req_params);break ;case POST_CHANGE : +if (ufshcd_is_auto_hibern8_supported (hba)) +ufshcd_writel (hba, reg,REG_AUTO_HIBERNATE_IDLE_TIMER );break ;default : ret = -EINVAL ;
@@ -1686,29 +1716,6 @@ static void ufs_mtk_dev_vreg_set_lpm(struct ufs_hba *hba, bool lpm) } } -static int ufs_mtk_auto_hibern8_disable (struct ufs_hba *hba) -{ -int ret; - -/* disable auto-hibern8 */ -ufshcd_writel (hba,0 ,REG_AUTO_HIBERNATE_IDLE_TIMER ); - -/* wait host return to idle state when auto-hibern8 off */ -ufs_mtk_wait_idle_state (hba,5 ); - - ret =ufs_mtk_wait_link_state (hba,VS_LINK_UP ,100 ); -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,enum ufs_notify_change_status status) {
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 7/10 ufs: host: mediatek: Return error directly on idle wait timeout
In reply to [email protected]From: Sanjeev Y <[email protected]>
Optimize the recovery flow by returning an error code immediately if a wait idle timeout occurs, rather than waiting for the link to reach the up state. Shorten the recovery process and improve error handling efficiency when idle state transitions fail.
--- drivers/ufs/host/ufs-mediatek.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/ufs/host/ufs-mediatek.c +16 -4
@@ -416,7 +416,7 @@ static void ufs_mtk_dbg_sel(struct ufs_hba *hba) } } -static void ufs_mtk_wait_idle_state (struct ufs_hba *hba, +static int ufs_mtk_wait_idle_state (struct ufs_hba *hba,unsigned long retry_ms) {u64 timeout, time_checked;
@@ -452,8 +452,12 @@ static void ufs_mtk_wait_idle_state(struct ufs_hba *hba,break ; }while (time_checked < timeout); -if (wait_idle && sm !=VS_HCE_BASE ) +if (wait_idle && sm !=VS_HCE_BASE ) {dev_info (hba->dev,"wait idle tmo: 0x%x\n" , val); +return -ETIMEDOUT ; + } + +return 0 ; } static int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state,
@@ -1437,9 +1441,13 @@ static int ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)ufshcd_writel (hba,0 ,REG_AUTO_HIBERNATE_IDLE_TIMER );/* wait host return to idle state when auto-hibern8 off */ -ufs_mtk_wait_idle_state (hba,5 ); + ret =ufs_mtk_wait_idle_state (hba,5 ); +if (ret) + goto out; ret =ufs_mtk_wait_link_state (hba,VS_LINK_UP ,100 ); + +out:if (ret) {dev_warn (hba->dev,"exit h8 state fail, ret=%d\n" , ret);
@@ -1614,7 +1622,11 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba)return err;/* Check link state to make sure exit h8 success */ -ufs_mtk_wait_idle_state (hba,5 ); + err =ufs_mtk_wait_idle_state (hba,5 ); +if (err) { +dev_warn (hba->dev,"wait idle fail, err=%d\n" , err); +return err; + } err =ufs_mtk_wait_link_state (hba,VS_LINK_UP ,100 );if (err) {dev_warn (hba->dev,"exit h8 state fail, err=%d\n" , err);
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 8/10 ufs: host: mediatek: Fix adapt issue after PA_Init
In reply to [email protected]From: Alice Chao <[email protected]>
Address the issue where the host does not send adapt to the device after PA_Init success. Ensure the adapt process is correctly initiated for devices with IP version MT6899 and above, resolving communication issues between the host and device.
--- drivers/ufs/host/ufs-mediatek.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/ufs/host/ufs-mediatek.c +11 -0
@@ -1551,8 +1551,19 @@ static int ufs_mtk_pre_link(struct ufs_hba *hba)return ret; } +static void ufs_mtk_post_link (struct ufs_hba *hba) { +struct ufs_mtk_host *host =ufshcd_get_variant (hba); +u32 tmp; + +/* fix device PA_INIT no adapt */ +if (host->ip_ver >=IP_VER_MT6899 ) { +ufshcd_dme_get (hba,UIC_ARG_MIB (VS_DEBUGOMC ), &tmp); + tmp |=0x100 ; +ufshcd_dme_set (hba,UIC_ARG_MIB (VS_DEBUGOMC ), tmp); + } +/* enable unipro clock gating feature */ ufs_mtk_cfg_unipro_cg (hba, true); }
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 9/10 ufs: host: mediatek: Fix unbalanced IRQ enable issue
In reply to [email protected]From: Peter Wang <[email protected]>
Resolve the issue of unbalanced IRQ enablement by setting the 'is_mcq_intr_enabled' flag after the first successful IRQ enablement. Ensure proper tracking of the IRQ state and prevent potential mismatches in IRQ handling.
--- drivers/ufs/host/ufs-mediatek.c | 1 + 1 file changed, 1 insertion(+)
drivers/ufs/host/ufs-mediatek.c +1 -0
@@ -2190,6 +2190,7 @@ static int ufs_mtk_config_mcq_irq(struct ufs_hba *hba)return ret; } } + host->is_mcq_intr_enabled = true;return 0 ; }
Signature · 1 line
2.45.2
[email protected]
maintainerPATCH v3 10/10 ufs: host: mediatek: Fix device power control
In reply to [email protected]From: Peter Wang <[email protected]>
Adjust the timing of device power control to ensure low power mode (LPM) is entered only after VCC is turned off. Prevent VCCQ/VCCQ2 from entering LPM prematurely, ensuring proper power management and device stability.
--- drivers/ufs/host/ufs-mediatek.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/ufs/host/ufs-mediatek.c +7 -0
@@ -2342,6 +2342,13 @@ static int ufs_mtk_probe(struct platform_device *pdev) host->phy_dev = phy_dev; } +/* +* Because the default power setting of VSx (the upper layer of +* VCCQ/VCCQ2) is HWLP, we need to prevent VCCQ/VCCQ2 from +* entering LPM. +*/ +ufs_mtk_dev_vreg_set_lpm (hba, false); + out:of_node_put (phy_node);of_node_put (reset_node);
Signature · 1 line
2.45.2
Martin K. Petersen
AppliedQuoted 5 lines
Enhance the UFS host driver's reliability, power management efficiency, and error recovery mechanisms on MediaTek platforms. Address critical issues and introduce optimizations to improve system stability and performance.
Applied to 6.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen