scsi: ufs: Fix PMC and low-power mode on MediaTek UFS platforms
Subsystems (3)
v2 cover scsi: ufs: Fix PMC and low-power mode on MediaTek UFS platforms
Hi Martin,
This series provides some fixes on MediaTek UFS platforms, please consider this patch series for kernel v5.20.
- Provide workaround for power mode change for HS-G5
- Fix and provide VCCQx low-power support
Changes compared to v1:
- Add patches to fix and provide VCCQx low-power support
Alice Chao (1):
scsi: ufs-mediatek: Support flexible parameters for smc calls
CC Chou (1):
scsi: ufs-mediatek: Introduce workaround for power mode change
Peter Wang (1):
scsi: ufs-mediatek: Support low-power mode for VCCQ
Po-Wen Kao (2):
scsi: ufs-mediatek: Fix the timing of configuring device regulators
scsi: ufs-mediatek: Prevent device regulators setting as LPM
incorrectly
Stanley Chu (3):
scsi: ufs: Export ufshcd_uic_change_pwr_mode()
scsi: ufs: Fix ADAPT logic for HS-G5
scsi: ufs-mediatek: Support low-power mode for parents of VCCQx
drivers/ufs/core/ufshcd.c | 5 +- drivers/ufs/host/ufs-mediatek.c | 186 ++++++++++++++++++++++++++------ drivers/ufs/host/ufs-mediatek.h | 61 +++++++++++ include/ufs/ufshcd.h | 1 + include/ufs/unipro.h | 1 + 5 files changed, 221 insertions(+), 33 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 1/8 scsi: ufs: Export ufshcd_uic_change_pwr_mode()
Export ufshcd_uic_change_pwr_mode() to allow vendors to use it for SoC-specific power mode change design limitation.
--- drivers/ufs/core/ufshcd.c | 3 ++- include/ufs/ufshcd.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +2 -1
@@ -4091,7 +4091,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)* * Returns 0 on success, non-zero value on failure */ -static int ufshcd_uic_change_pwr_mode (struct ufs_hba *hba,u8 mode) +int ufshcd_uic_change_pwr_mode (struct ufs_hba *hba,u8 mode) {struct uic_command uic_cmd = {0 };int ret;
@@ -4116,6 +4116,7 @@ static int ufshcd_uic_change_pwr_mode(struct ufs_hba *hba, u8 mode) out:return ret; } +EXPORT_SYMBOL_GPL (ufshcd_uic_change_pwr_mode);int ufshcd_link_recovery (struct ufs_hba *hba) {
include/ufs/ufshcd.h +1 -0
@@ -1087,6 +1087,7 @@ extern int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel, u32 *mib_val, u8 peer);extern int ufshcd_config_pwr_mode (struct ufs_hba *hba,struct ufs_pa_layer_attr *desired_pwr_mode); +extern int ufshcd_uic_change_pwr_mode (struct ufs_hba *hba,u8 mode);/* UIC command interfaces for DME primitives */ #define DME_LOCAL 0
Signature · 1 line
2.18.0
PATCH v2 2/8 scsi: ufs: Fix ADAPT logic for HS-G5
In reply to Stanley ChuADAPT now is added not only for HS Gear4 mode but also higher gears. Fix the logic for higher gears.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -3802,7 +3802,7 @@ int ufshcd_dme_configure_adapt(struct ufs_hba *hba, {int ret; -if (agreed_gear !=UFS_HS_G4 ) +if (agreed_gear <UFS_HS_G4 ) adapt_val =PA_NO_ADAPT ; ret = ufshcd_dme_set(hba,
Signature · 1 line
2.18.0
PATCH v2 3/8 scsi: ufs-mediatek: Introduce workaround for power mode change
In reply to Stanley ChuFrom: CC Chou <[email protected]>
Some MediaTek SoC chips need special flow for power mode change, especially for chips supporting HS-G5.
Enable the workaround by setting the host-specific capability.
--- drivers/ufs/host/ufs-mediatek.c | 60 +++++++++++++++++++++++++++++++-- drivers/ufs/host/ufs-mediatek.h | 1 + include/ufs/unipro.h | 1 + 3 files changed, 60 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-mediatek.c +58 -2
@@ -82,6 +82,13 @@ static bool ufs_mtk_is_broken_vcc(struct ufs_hba *hba)return !!(host->caps &UFS_MTK_CAP_BROKEN_VCC ); } +static bool ufs_mtk_is_pmc_via_fastauto (struct ufs_hba *hba) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); + +return (host->caps &UFS_MTK_CAP_PMC_VIA_FASTAUTO ); +} +static void ufs_mtk_cfg_unipro_cg (struct ufs_hba *hba,bool enable) {u32 tmp;
@@ -579,6 +586,9 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)if (of_property_read_bool (np,"mediatek,ufs-broken-vcc" )) host->caps |=UFS_MTK_CAP_BROKEN_VCC ; +if (of_property_read_bool (np,"mediatek,ufs-pmc-via-fastauto" )) + host->caps |=UFS_MTK_CAP_PMC_VIA_FASTAUTO ; +dev_info (hba->dev,"caps: 0x%x" , host->caps); }
@@ -754,6 +764,26 @@ static int ufs_mtk_init(struct ufs_hba *hba)return err; } +static bool ufs_mtk_pmc_via_fastauto (struct ufs_hba *hba, +struct ufs_pa_layer_attr *dev_req_params) +{ +if (!ufs_mtk_is_pmc_via_fastauto (hba)) +return false; + +if (dev_req_params->hs_rate == hba->pwr_info.hs_rate) +return false; + +if ((dev_req_params->pwr_tx !=FAST_MODE ) && + (dev_req_params->gear_tx <UFS_HS_G4 )) +return false; + +if ((dev_req_params->pwr_rx !=FAST_MODE ) && + (dev_req_params->gear_rx <UFS_HS_G4 )) +return false; + +return true; +} +static int ufs_mtk_pre_pwr_change (struct ufs_hba *hba,struct ufs_pa_layer_attr *dev_max_params,struct ufs_pa_layer_attr *dev_req_params)
@@ -763,8 +793,8 @@ static int ufs_mtk_pre_pwr_change(struct ufs_hba *hba,int ret;ufshcd_init_pwr_dev_param (&host_cap); - host_cap.hs_rx_gear =UFS_HS_G4 ; - host_cap.hs_tx_gear =UFS_HS_G4 ; + host_cap.hs_rx_gear =UFS_HS_G5 ; + host_cap.hs_tx_gear =UFS_HS_G5 ; ret = ufshcd_get_pwr_dev_param(&host_cap, dev_max_params,
@@ -774,6 +804,32 @@ static int ufs_mtk_pre_pwr_change(struct ufs_hba *hba, __func__); } +if (ufs_mtk_pmc_via_fastauto (hba, dev_req_params)) { +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXTERMINATION ), true); +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXGEAR ),UFS_HS_G1 ); + +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_RXTERMINATION ), true); +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_RXGEAR ),UFS_HS_G1 ); + +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_ACTIVETXDATALANES ), + dev_req_params->lane_tx); +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_ACTIVERXDATALANES ), + dev_req_params->lane_rx); +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HSSERIES ), + dev_req_params->hs_rate); + +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TXHSADAPTTYPE ), +PA_NO_ADAPT ); + + ret =ufshcd_uic_change_pwr_mode (hba, +FASTAUTO_MODE <<4 |FASTAUTO_MODE ); + +if (ret) { +dev_err (hba->dev,"%s: HSG1B FASTAUTO failed ret=%d\n" , + __func__, ret); + } + } +if (host->hw_ver.major >=3 ) { ret = ufshcd_dme_configure_adapt(hba, dev_req_params->gear_tx,
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -108,6 +108,7 @@ enum ufs_mtk_host_caps {UFS_MTK_CAP_VA09_PWR_CTRL =1 <<1 ,UFS_MTK_CAP_DISABLE_AH8 =1 <<2 ,UFS_MTK_CAP_BROKEN_VCC =1 <<3 , + UFS_MTK_CAP_PMC_VIA_FASTAUTO = 1 << 6, }; struct ufs_mtk_crypt_cfg {
include/ufs/unipro.h +1 -0
@@ -229,6 +229,7 @@ enum ufs_hs_gear_tag {UFS_HS_G2 ,/* HS Gear 2 */ UFS_HS_G3 ,/* HS Gear 3 */ UFS_HS_G4 ,/* HS Gear 4 */ +UFS_HS_G5 /* HS Gear 5 */ }; enum ufs_unipro_ver {
Signature · 1 line
2.18.0
PATCH v2 4/8 scsi: ufs-mediatek: Fix the timing of configuring device regulators
In reply to Stanley ChuFrom: Po-Wen Kao <[email protected]>
Currently the LPM configurations of device regulators may not work since VCC is not disabled yet while ufs_mtk_vreg_set_lpm() is executed.
Fix it by changing the timing of invoking ufs_mtk_vreg_set_lpm().
--- drivers/ufs/host/ufs-mediatek.c | 60 ++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 5 deletions(-)
drivers/ufs/host/ufs-mediatek.c +55 -5
@@ -1082,7 +1082,6 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,* ufshcd_suspend() re-enabling regulators while vreg is still * in low-power mode. */ -ufs_mtk_vreg_set_lpm (hba, true); err =ufs_mtk_mphy_power_on (hba, false);if (err) goto fail;
@@ -1106,12 +1105,13 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) {int err; +if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL ) +ufs_mtk_vreg_set_lpm (hba, false); + err =ufs_mtk_mphy_power_on (hba, true);if (err) goto fail; -ufs_mtk_vreg_set_lpm (hba, false); -if (ufshcd_is_link_hibern8 (hba)) { err =ufs_mtk_link_set_hpm (hba);if (err)
@@ -1276,9 +1276,59 @@ static int ufs_mtk_remove(struct platform_device *pdev)return 0 ; } +int ufs_mtk_system_suspend (struct device *dev) +{ +int ret =0 ; +struct ufs_hba *hba =dev_get_drvdata (dev); + + ret =ufshcd_system_suspend (dev); + +if (!ret) +ufs_mtk_vreg_set_lpm (hba, true); + +return ret; +} + +int ufs_mtk_system_resume (struct device *dev) +{ +int ret =0 ; +struct ufs_hba *hba =dev_get_drvdata (dev); + +ufs_mtk_vreg_set_lpm (hba, false); + + ret =ufshcd_system_resume (dev); + +return ret; +} + +int ufs_mtk_runtime_suspend (struct device *dev) +{ +struct ufs_hba *hba =dev_get_drvdata (dev); +int ret =0 ; + + ret =ufshcd_runtime_suspend (dev); + +if (!ret) +ufs_mtk_vreg_set_lpm (hba, true); + +return ret; +} + +int ufs_mtk_runtime_resume (struct device *dev) +{ +struct ufs_hba *hba =dev_get_drvdata (dev); +int ret =0 ; + +ufs_mtk_vreg_set_lpm (hba, false); + + ret =ufshcd_runtime_resume (dev); + +return ret; +} +static const struct dev_pm_ops ufs_mtk_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume) -SET_RUNTIME_PM_OPS (ufshcd_runtime_suspend, ufshcd_runtime_resume,NULL ) + SET_SYSTEM_SLEEP_PM_OPS(ufs_mtk_system_suspend, ufs_mtk_system_resume) +SET_RUNTIME_PM_OPS (ufs_mtk_runtime_suspend, ufs_mtk_runtime_resume,NULL ) .prepare = ufshcd_suspend_prepare, .complete = ufshcd_resume_complete, };
Signature · 1 line
2.18.0
PATCH v2 5/8 scsi: ufs-mediatek: Prevent device regulators setting as LPM incorrectly
In reply to Stanley ChuFrom: Po-Wen Kao <[email protected]>
Device regulatrs are allowed to enter low-power mode if neither device is not in active mode, nor VCC does not keep on.
Simply fix this by adding conditions before LPM decision.
--- drivers/ufs/host/ufs-mediatek.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-mediatek.c +10 -2
@@ -1034,10 +1034,18 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm)if (!hba->vreg_info.vccq2 || !hba->vreg_info.vcc)return ; -if (lpm && !hba->vreg_info.vcc->enabled) +/* Bypass LPM when device is still active */ +if (lpm &&ufshcd_is_ufs_dev_active (hba)) +return ; + +/* Bypass LPM if VCC is enabled */ +if (lpm && hba->vreg_info.vcc->enabled) +return ; + +if (lpm)regulator_set_mode (hba->vreg_info.vccq2->reg,REGULATOR_MODE_IDLE ); -else if (!lpm) +else regulator_set_mode (hba->vreg_info.vccq2->reg,REGULATOR_MODE_NORMAL ); }
Signature · 1 line
2.18.0
PATCH v2 6/8 scsi: ufs-mediatek: Support low-power mode for VCCQ
In reply to Stanley ChuFrom: Peter Wang <[email protected]>
Also allow VCCQ to enter low-power mode, and meanwhile remove the restriction of VCC because VCCQ/VCCQ2 can be changed to low-power mode even if VCC keeps on while the device is not in active power mode.
--- drivers/ufs/host/ufs-mediatek.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-mediatek.c +13 -6
@@ -1031,7 +1031,13 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba)static void ufs_mtk_vreg_set_lpm (struct ufs_hba *hba,bool lpm) { -if (!hba->vreg_info.vccq2 || !hba->vreg_info.vcc) +struct ufs_vreg *vccqx =NULL ; + +if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2) +return ; + +/* Skip if VCC is assumed always-on */ +if (!hba->vreg_info.vcc)return ;/* Bypass LPM when device is still active */
@@ -1042,12 +1048,13 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm)if (lpm && hba->vreg_info.vcc->enabled)return ; -if (lpm) -regulator_set_mode (hba->vreg_info.vccq2->reg, -REGULATOR_MODE_IDLE ); +if (hba->vreg_info.vccq) + vccqx = hba->vreg_info.vccq;else -regulator_set_mode (hba->vreg_info.vccq2->reg, -REGULATOR_MODE_NORMAL ); + vccqx = hba->vreg_info.vccq2; + +regulator_set_mode (vccqx->reg, + lpm ?REGULATOR_MODE_IDLE :REGULATOR_MODE_NORMAL ); }static void ufs_mtk_auto_hibern8_disable (struct ufs_hba *hba)
Signature · 1 line
2.18.0
PATCH v2 7/8 scsi: ufs-mediatek: Support flexible parameters for smc calls
In reply to Stanley ChuFrom: Alice Chao <[email protected]>
Provide flexible number of parameters for UFS SMC calls to be easily used for future SMC usages.
This is a preparation patch for the next patch.
--- drivers/ufs/host/ufs-mediatek.c | 16 ---------- drivers/ufs/host/ufs-mediatek.h | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 16 deletions(-)
drivers/ufs/host/ufs-mediatek.c +0 -16
@@ -30,22 +30,6 @@#define CREATE_TRACE_POINTS #include "ufs-mediatek-trace.h" -#define ufs_mtk_smc (cmd, val, res) \ - arm_smccc_smc(MTK_SIP_UFS_CONTROL, \ - cmd, val, 0, 0, 0, 0, 0, &(res)) - -#define ufs_mtk_va09_pwr_ctrl (res, on) \ - ufs_mtk_smc(UFS_MTK_SIP_VA09_PWR_CTRL, on, res) - -#define ufs_mtk_crypto_ctrl (res, enable) \ - ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, enable, res) - -#define ufs_mtk_ref_clk_notify (on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, on, res) - -#define ufs_mtk_device_reset_ctrl (high, res) \ - ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res) -static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = { { .wmanufacturerid =UFS_VENDOR_MICRON , .model =UFS_ANY_MODEL ,
drivers/ufs/host/ufs-mediatek.h +56 -0
60 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v2 8/8 scsi: ufs-mediatek: Support low-power mode for parents of VCCQx
In reply to Stanley ChuProvide the facility to configure parents of VCCQx power rails as low-power or full-power mode in MediaTek UFS platforms.
--- drivers/ufs/host/ufs-mediatek.c | 45 +++++++++++++++++++++++---------- drivers/ufs/host/ufs-mediatek.h | 4 +++ 2 files changed, 36 insertions(+), 13 deletions(-)
drivers/ufs/host/ufs-mediatek.c +32 -13
@@ -1013,10 +1013,29 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba)return 0 ; } -static void ufs_mtk_vreg_set_lpm (struct ufs_hba *hba,bool lpm) +static void ufs_mtk_vccqx_set_lpm (struct ufs_hba *hba,bool lpm) {struct ufs_vreg *vccqx =NULL ; +if (hba->vreg_info.vccq) + vccqx = hba->vreg_info.vccq; +else + vccqx = hba->vreg_info.vccq2; + +regulator_set_mode (vccqx->reg, + lpm ?REGULATOR_MODE_IDLE :REGULATOR_MODE_NORMAL ); +} + +static void ufs_mtk_vsx_set_lpm (struct ufs_hba *hba,bool lpm) +{ +struct arm_smccc_res res; + +ufs_mtk_device_pwr_ctrl (!lpm, + (unsigned long )hba->dev_info.wspecversion, res); +} + +static void ufs_mtk_dev_vreg_set_lpm (struct ufs_hba *hba,bool lpm) +{if (!hba->vreg_info.vccq && !hba->vreg_info.vccq2)return ;
@@ -1032,13 +1051,13 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm)if (lpm && hba->vreg_info.vcc->enabled)return ; -if (hba->vreg_info.vccq) - vccqx = hba->vreg_info.vccq; -else - vccqx = hba->vreg_info.vccq2; - -regulator_set_mode (vccqx->reg, - lpm ?REGULATOR_MODE_IDLE :REGULATOR_MODE_NORMAL ); +if (lpm) { +ufs_mtk_vccqx_set_lpm (hba, lpm); +ufs_mtk_vsx_set_lpm (hba, lpm); + }else { +ufs_mtk_vsx_set_lpm (hba, lpm); +ufs_mtk_vccqx_set_lpm (hba, lpm); + } }static void ufs_mtk_auto_hibern8_disable (struct ufs_hba *hba)
@@ -1105,7 +1124,7 @@ static int ufs_mtk_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)int err;if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL ) -ufs_mtk_vreg_set_lpm (hba, false); +ufs_mtk_dev_vreg_set_lpm (hba, false); err =ufs_mtk_mphy_power_on (hba, true);if (err)
@@ -1283,7 +1302,7 @@ int ufs_mtk_system_suspend(struct device *dev) ret =ufshcd_system_suspend (dev);if (!ret) -ufs_mtk_vreg_set_lpm (hba, true); +ufs_mtk_dev_vreg_set_lpm (hba, true);return ret; }
@@ -1293,7 +1312,7 @@ int ufs_mtk_system_resume(struct device *dev)int ret =0 ;struct ufs_hba *hba =dev_get_drvdata (dev); -ufs_mtk_vreg_set_lpm (hba, false); +ufs_mtk_dev_vreg_set_lpm (hba, false); ret =ufshcd_system_resume (dev);
@@ -1308,7 +1327,7 @@ int ufs_mtk_runtime_suspend(struct device *dev) ret =ufshcd_runtime_suspend (dev);if (!ret) -ufs_mtk_vreg_set_lpm (hba, true); +ufs_mtk_dev_vreg_set_lpm (hba, true);return ret; }
@@ -1318,7 +1337,7 @@ int ufs_mtk_runtime_resume(struct device *dev)struct ufs_hba *hba =dev_get_drvdata (dev);int ret =0 ; -ufs_mtk_vreg_set_lpm (hba, false); +ufs_mtk_dev_vreg_set_lpm (hba, false); ret =ufshcd_runtime_resume (dev);
drivers/ufs/host/ufs-mediatek.h +4 -0
@@ -83,6 +83,7 @@ enum {#define UFS_MTK_SIP_DEVICE_RESET BIT(1)#define UFS_MTK_SIP_CRYPTO_CTRL BIT(2)#define UFS_MTK_SIP_REF_CLK_NOTIFICATION BIT(3) +#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)/* * VS_DEBUGCLOCKENABLE
@@ -199,4 +200,7 @@ struct ufs_mtk_host {#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, res, high) +#define ufs_mtk_device_pwr_ctrl (on, ufs_ver, res) \ + ufs_mtk_smc(UFS_MTK_SIP_DEVICE_PWR_CTRL, res, on, ufs_ver) +#endif /* !_UFS_MEDIATEK_H */
Signature · 1 line
2.18.0