Provide features and fixes in MediaTek UFS platform
v2 cover Provide features and fixes in MediaTek UFS platform
Hi Martin,
This series provides some fixes and features in MediaTek UFS platform. Please consider this patch series for kernel v5.20.
Compared to v1:
- Add one patch to fix invalid access to vccqx
Alice Chao (1):
scsi: ufs-mediatek: Fix invalid access to vccqx
Peter Wang (4):
scsi: ufs-mediatek: Always add delays for VCC operations
scsi: ufs-mediatek: Prevent host hang by setting CLK_CG early
scsi: ufs-mediatek: Add stage information for ref-clk control
scsi: ufs-mediatek: Support performance boosting
Po-Wen Kao (2):
scsi: ufs-mediatek: Disable reset confirm feature by UniPro
scsi: ufs-mediatek: Support host power control
Stanley Chu (1):
scsi: ufs-mediatek: Fix build warnings
drivers/ufs/host/ufs-mediatek.c | 77 +++++++++++++++++++++++++-------- drivers/ufs/host/ufs-mediatek.h | 20 ++++++++- 2 files changed, 76 insertions(+), 21 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 1/8 scsi: ufs-mediatek: Fix build warnings
Fix build warnings as below,
1.../drivers/ufs/host/ufs-mediatek.c:1375:5: error: no previous prototype for function 'ufs_mtk_system_suspend' [-Werror,-Wmissing-prototypes] int ufs_mtk_system_suspend(struct device *dev)
^
../drivers/ufs/host/ufs-mediatek.c:1375:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int ufs_mtk_system_suspend(struct device *dev)
^
static
2.../drivers/ufs/host/ufs-mediatek.c:702:50: error: format specifies type 'unsigned long' but the argument has type 'int' [-Werror,-Wformat]
snprintf(vcc_name, MAX_VCC_NAME, "vcc-ufs%lu", ver);
~~~ ^~~
%d--- drivers/ufs/host/ufs-mediatek.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/ufs/host/ufs-mediatek.c +5 -5
@@ -690,7 +690,7 @@ static int ufs_mtk_vreg_fix_vcc(struct ufs_hba *hba)return -ENODEV ; }else if (of_property_read_bool (np,"mediatek,ufs-vcc-by-ver" )) { ver = (hba->dev_info.wspecversion &0xF00 ) >>8 ; -snprintf (vcc_name,MAX_VCC_NAME ,"vcc-ufs%lu" , ver); +snprintf (vcc_name,MAX_VCC_NAME ,"vcc-ufs%d" , ver); }else {return 0 ; }
@@ -1364,7 +1364,7 @@ static int ufs_mtk_remove(struct platform_device *pdev) }#ifdef CONFIG_PM_SLEEP -int ufs_mtk_system_suspend (struct device *dev) +static int ufs_mtk_system_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev);int ret;
@@ -1378,7 +1378,7 @@ int ufs_mtk_system_suspend(struct device *dev)return 0 ; } -int ufs_mtk_system_resume (struct device *dev) +static int ufs_mtk_system_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev);
@@ -1388,7 +1388,7 @@ int ufs_mtk_system_resume(struct device *dev) }#endif -int ufs_mtk_runtime_suspend (struct device *dev) +static int ufs_mtk_runtime_suspend (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev);int ret =0 ;
@@ -1402,7 +1402,7 @@ int ufs_mtk_runtime_suspend(struct device *dev)return 0 ; } -int ufs_mtk_runtime_resume (struct device *dev) +static int ufs_mtk_runtime_resume (struct device *dev) {struct ufs_hba *hba =dev_get_drvdata (dev);
Signature · 1 line
2.18.0
PATCH v2 2/8 scsi: ufs-mediatek: Always add delays for VCC operations
In reply to Stanley ChuFrom: Peter Wang <[email protected]>
MediaTek decides to always add delays before and after VCC is turned-off.
--- drivers/ufs/host/ufs-mediatek.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-mediatek.c +3 -2
@@ -31,9 +31,10 @@#include "ufs-mediatek-trace.h" static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = { - { .wmanufacturerid =UFS_VENDOR_MICRON , + { .wmanufacturerid =UFS_ANY_VENDOR , .model =UFS_ANY_MODEL , - .quirk =UFS_DEVICE_QUIRK_DELAY_AFTER_LPM }, + .quirk =UFS_DEVICE_QUIRK_DELAY_AFTER_LPM | +UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM }, { .wmanufacturerid =UFS_VENDOR_SKHYNIX , .model ="H9HQ21AFAMZDAR" , .quirk =UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES },
Signature · 1 line
2.18.0
PATCH v2 3/8 scsi: ufs-mediatek: Prevent host hang by setting CLK_CG early
In reply to Stanley ChuFrom: Peter Wang <[email protected]>
Some UFSHCI hosts in MediaTek UFS platform need workaround to prevent host hang issue by setting CLK_CG bit before host is enabled.
This operation shall have no side effect on those platforms which do not support this bit.
--- drivers/ufs/host/ufs-mediatek.c | 8 ++++++++ drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 9 insertions(+)
drivers/ufs/host/ufs-mediatek.c +8 -0
@@ -183,6 +183,14 @@ static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba, hba->capabilities &= ~MASK_AUTO_HIBERN8_SUPPORT ; hba->ahit =0 ; } + +/* +* Turn on CLK_CG early to bypass abnormal ERR_CHK signal +* to prevent host hang issue +*/ +ufshcd_writel (hba, +ufshcd_readl (hba,REG_UFS_XOUFS_CTRL ) |0x80 , +REG_UFS_XOUFS_CTRL ); }return 0 ;
drivers/ufs/host/ufs-mediatek.h +1 -0
@@ -12,6 +12,7 @@/* * Vendor specific UFSHCI Registers */ +#define REG_UFS_XOUFS_CTRL 0x140#define REG_UFS_REFCLK_CTRL 0x144#define REG_UFS_EXTREG 0x2100#define REG_UFS_MPHYCTRL 0x2200
Signature · 1 line
2.18.0
PATCH v2 4/8 scsi: ufs-mediatek: Add stage information for ref-clk control
In reply to Stanley ChuFrom: Peter Wang <[email protected]>
Add "PRE_CHANGE" and "POST_CHANGE" information for ref-clk control to precisely configure the low-power state of the parent of ref-clk.
--- drivers/ufs/host/ufs-mediatek.c | 9 +++++---- drivers/ufs/host/ufs-mediatek.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-mediatek.c +5 -4
@@ -244,8 +244,9 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)if (host->ref_clk_enabled == on)return 0 ; +ufs_mtk_ref_clk_notify (on,PRE_CHANGE , res); +if (on) { -ufs_mtk_ref_clk_notify (on, res);ufshcd_writel (hba,REFCLK_REQUEST ,REG_UFS_REFCLK_CTRL ); }else {ufshcd_delay_us (host->ref_clk_gating_wait_us,10 );
@@ -267,7 +268,7 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on)dev_err (hba->dev,"missing ack of refclk req, reg: 0x%x\n" , value); -ufs_mtk_ref_clk_notify (host->ref_clk_enabled, res); +ufs_mtk_ref_clk_notify (host->ref_clk_enabled,POST_CHANGE , res);return -ETIMEDOUT ;
@@ -275,8 +276,8 @@ static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on) host->ref_clk_enabled = on;if (on)ufshcd_delay_us (host->ref_clk_ungating_wait_us,10 ); -else -ufs_mtk_ref_clk_notify (on, res); + +ufs_mtk_ref_clk_notify (on,POST_CHANGE , res);return 0 ; }
drivers/ufs/host/ufs-mediatek.h +2 -2
@@ -189,8 +189,8 @@ static void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_crypto_ctrl (res, enable) \ ufs_mtk_smc(UFS_MTK_SIP_CRYPTO_CTRL, &(res), enable) -#define ufs_mtk_ref_clk_notify (on, res) \ - ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, &(res), on) +#define ufs_mtk_ref_clk_notify (on, stage, res) \ + ufs_mtk_smc(UFS_MTK_SIP_REF_CLK_NOTIFICATION, &(res), on, stage)#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high)
Signature · 1 line
2.18.0
PATCH v2 5/8 scsi: ufs-mediatek: Disable reset confirm feature by UniPro
In reply to Stanley ChuFrom: Po-Wen Kao <[email protected]>
In MediaTek UFS platforms, UniPro will not return reset confirm if it is in POWERDOWN state thus hang issue may happen while disabling UFSHCI. Simply disable this feature before UniPro leaves POWERDOWN state.
--- drivers/ufs/host/ufs-mediatek.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/ufs/host/ufs-mediatek.c +5 -0
@@ -1079,6 +1079,11 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba) {int err; +/* Disable reset confirm feature by UniPro */ +ufshcd_writel (hba, + (ufshcd_readl (hba,REG_UFS_XOUFS_CTRL ) & ~0x100 ), +REG_UFS_XOUFS_CTRL ); + err =ufs_mtk_unipro_set_lpm (hba, true);if (err) {/* Resume UniPro state for following error recovery */
Signature · 1 line
2.18.0
PATCH v2 6/8 scsi: ufs-mediatek: Support host power control
In reply to Stanley ChuFrom: Po-Wen Kao <[email protected]>
Add interfaces for controlling the host power to optimize the power consumption in MediaTek UFS platforms.
--- drivers/ufs/host/ufs-mediatek.c | 5 +++++ drivers/ufs/host/ufs-mediatek.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)
drivers/ufs/host/ufs-mediatek.c +5 -0
@@ -1190,6 +1190,8 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,if (ufshcd_is_link_off (hba))ufs_mtk_device_reset_ctrl (0 , res); +ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , false, res); +return 0 ; fail:/*
@@ -1204,10 +1206,13 @@ static int ufs_mtk_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,static int ufs_mtk_resume (struct ufs_hba *hba,enum ufs_pm_op pm_op) {int err; +struct arm_smccc_res res;if (hba->ufshcd_state !=UFSHCD_STATE_OPERATIONAL )ufs_mtk_dev_vreg_set_lpm (hba, false); +ufs_mtk_host_pwr_ctrl (HOST_PWR_HCI , true, res); + err =ufs_mtk_mphy_power_on (hba, true);if (err) goto fail;
drivers/ufs/host/ufs-mediatek.h +12 -0
@@ -84,6 +84,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_HOST_PWR_CTRL BIT(5)#define UFS_MTK_SIP_GET_VCC_NUM BIT(6)#define UFS_MTK_SIP_DEVICE_PWR_CTRL BIT(7)
@@ -156,6 +157,14 @@ enum ufs_mtk_vcc_num { UFS_VCC_MAX }; +/* +* Host Power Control options +*/ +enum { +HOST_PWR_HCI =0 , +HOST_PWR_MPHY +}; +/* * SMC call wrapper function */
@@ -195,6 +204,9 @@ static void _ufs_mtk_smc(struct ufs_mtk_smc_arg s)#define ufs_mtk_device_reset_ctrl (high, res) \ ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, &(res), high) +#define ufs_mtk_host_pwr_ctrl (opt, on, res) \ + ufs_mtk_smc(UFS_MTK_SIP_HOST_PWR_CTRL, &(res), opt, on) +#define ufs_mtk_get_vcc_num (res) \ ufs_mtk_smc(UFS_MTK_SIP_GET_VCC_NUM, &(res))
Signature · 1 line
2.18.0
PATCH v2 7/8 scsi: ufs-mediatek: Support performance boosting
In reply to Stanley ChuFrom: Peter Wang <[email protected]>
Add pm-qos request to support performance boosting in MediaTek UFS platforms.
In the same time, adjust the order of function calls to be symmetric during the low-power control flow.
--- drivers/ufs/host/ufs-mediatek.c | 34 +++++++++++++++++++++++++-------- drivers/ufs/host/ufs-mediatek.h | 3 +++ 2 files changed, 29 insertions(+), 8 deletions(-)
drivers/ufs/host/ufs-mediatek.c +26 -8
@@ -16,6 +16,7 @@#include <linux/of_device.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <linux/pm_qos.h> #include <linux/regulator/consumer.h> #include <linux/reset.h> #include <linux/sched/clock.h>
@@ -586,17 +587,32 @@ static void ufs_mtk_init_host_caps(struct ufs_hba *hba)dev_info (hba->dev,"caps: 0x%x" , host->caps); } -static void ufs_mtk_scale_perf (struct ufs_hba *hba,bool up) +static void ufs_mtk_boost_pm_qos (struct ufs_hba *hba,bool boost) {struct ufs_mtk_host *host =ufshcd_get_variant (hba); -ufs_mtk_boost_crypt (hba, up); -ufs_mtk_setup_ref_clk (hba, up); +if (!host || !host->pm_qos_init) +return ; + +cpu_latency_qos_update_request (&host->pm_qos_req, + boost ?0 :PM_QOS_DEFAULT_VALUE ); +} + +static void ufs_mtk_pwr_ctrl (struct ufs_hba *hba,bool on) +{ +struct ufs_mtk_host *host =ufshcd_get_variant (hba); -if (up) +if (on) {phy_power_on (host->mphy); -else +ufs_mtk_setup_ref_clk (hba, on); +ufs_mtk_boost_crypt (hba, on); +ufs_mtk_boost_pm_qos (hba, on); + }else { +ufs_mtk_boost_pm_qos (hba, on); +ufs_mtk_boost_crypt (hba, on); +ufs_mtk_setup_ref_clk (hba, on);phy_power_off (host->mphy); + } }/**
@@ -641,9 +657,9 @@ static int ufs_mtk_setup_clocks(struct ufs_hba *hba, bool on, }if (clk_pwr_off) -ufs_mtk_scale_perf (hba, false); +ufs_mtk_pwr_ctrl (hba, false); }else if (on && status ==POST_CHANGE ) { -ufs_mtk_scale_perf (hba, true); +ufs_mtk_pwr_ctrl (hba, true); }return ret;
@@ -1248,8 +1264,10 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)struct ufs_dev_info *dev_info = &hba->dev_info;u16 mid = dev_info->wmanufacturerid; -if (mid ==UFS_VENDOR_SAMSUNG ) +if (mid ==UFS_VENDOR_SAMSUNG ) {ufshcd_dme_set (hba,UIC_ARG_MIB (PA_TACTIVATE ),6 ); +ufshcd_dme_set (hba,UIC_ARG_MIB (PA_HIBERN8TIME ),10 ); + }/* * Decide waiting time before gating reference clock and
drivers/ufs/host/ufs-mediatek.h +3 -0
@@ -7,6 +7,7 @@#define _UFS_MEDIATEK_H#include <linux/bitops.h> +#include <linux/pm_qos.h> #include <linux/soc/mediatek/mtk_sip_svc.h> /*
@@ -131,6 +132,7 @@ struct ufs_mtk_hw_ver {struct ufs_mtk_host {struct phy *mphy; +struct pm_qos_request pm_qos_req;struct regulator *reg_va09;struct reset_control *hci_reset;struct reset_control *unipro_reset;
@@ -140,6 +142,7 @@ struct ufs_mtk_host {struct ufs_mtk_hw_ver hw_ver;enum ufs_mtk_host_caps caps;bool mphy_powered_on; +bool pm_qos_init;bool unipro_lpm;bool ref_clk_enabled;u16 ref_clk_ungating_wait_us;
Signature · 1 line
2.18.0
PATCH v2 8/8 scsi: ufs-mediatek: Fix invalid access to vccqx
In reply to Stanley ChuFrom: Alice Chao <[email protected]>
NULL pointer access issue was found for the regulator released by ufs_mtk_vreg_fix_vccq(). Simply fix this issue by clearing the released vreg pointer in ufs_hba struct.
--- drivers/ufs/host/ufs-mediatek.c | 1 + 1 file changed, 1 insertion(+)
drivers/ufs/host/ufs-mediatek.c +1 -0
@@ -758,6 +758,7 @@ static void ufs_mtk_vreg_fix_vccqx(struct ufs_hba *hba)regulator_disable ((*vreg_off)->reg);devm_kfree (hba->dev, (*vreg_off)->name);devm_kfree (hba->dev, *vreg_off); + *vreg_off =NULL ; } }
Signature · 1 line
2.18.0
Quoted 2 lines · Stanley Chu
This series provides some fixes and features in MediaTek UFS platform. Please consider this patch series for kernel v5.20.
For the entire series, please add:
Martin K. Petersen
AppliedStanley,
Quoted 2 lines
This series provides some fixes and features in MediaTek UFS platform. Please consider this patch series for kernel v5.20.
Applied to 5.20/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 10 lines · Stanley Chu
This series provides some fixes and features in MediaTek UFS platform. Please consider this patch series for kernel v5.20.
Compared to v1:
- Add one patch to fix invalid access to vccqxAlice Chao (1):
scsi: ufs-mediatek: Fix invalid access to vccqx[...]
Applied to 5.20/scsi-queue, thanks!
[1/8] scsi: ufs-mediatek: Fix build warnings
https://git.kernel.org/mkp/scsi/c/e7bf1d50063c [2/8] scsi: ufs-mediatek: Always add delays for VCC operations https://git.kernel.org/mkp/scsi/c/981b4ac04c2f [3/8] scsi: ufs-mediatek: Prevent host hang by setting CLK_CG early https://git.kernel.org/mkp/scsi/c/2bae03a6ac98 [4/8] scsi: ufs-mediatek: Add stage information for ref-clk control https://git.kernel.org/mkp/scsi/c/f53f19135765 [5/8] scsi: ufs-mediatek: Disable reset confirm feature by UniPro https://git.kernel.org/mkp/scsi/c/4918694ccd69 [6/8] scsi: ufs-mediatek: Support host power control https://git.kernel.org/mkp/scsi/c/2cf5cb2bb131 [7/8] scsi: ufs-mediatek: Support performance boosting https://git.kernel.org/mkp/scsi/c/c64c487d9533 [8/8] scsi: ufs-mediatek: Fix invalid access to vccqx https://git.kernel.org/mkp/scsi/c/df1ea242e3d7
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering