scsi: ufs: ufs-mediatek: Fix performance scaling

If clk-scaling is enabled, performance scaling can be bound to the decision
of clk-scaling to avoid unnecessary boosting.

In addition, fix missing initialization of pm-qos request.

Link: https://lore.kernel.org/r/20220802235437.4547-5-stanley.chu@mediatek.com
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 2b85d24..e1f131a 100644 (file)
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c
@@ -635,6 +635,12 @@ static void ufs_mtk_boost_pm_qos(struct ufs_hba *hba, bool boost)
                                       boost ? 0 : PM_QOS_DEFAULT_VALUE);
 }
 
+static void ufs_mtk_scale_perf(struct ufs_hba *hba, bool scale_up)
+{
+       ufs_mtk_boost_crypt(hba, scale_up);
+       ufs_mtk_boost_pm_qos(hba, scale_up);
+}
+
 static void ufs_mtk_pwr_ctrl(struct ufs_hba *hba, bool on)
 {
        struct ufs_mtk_host *host = ufshcd_get_variant(hba);
@@ -642,11 +648,11 @@ static void ufs_mtk_pwr_ctrl(struct ufs_hba *hba, bool on)
        if (on) {
                phy_power_on(host->mphy);
                ufs_mtk_setup_ref_clk(hba, on);
-               ufs_mtk_boost_crypt(hba, on);
-               ufs_mtk_boost_pm_qos(hba, on);
+               if (!ufshcd_is_clkscaling_supported(hba))
+                       ufs_mtk_scale_perf(hba, on);
        } else {
-               ufs_mtk_boost_pm_qos(hba, on);
-               ufs_mtk_boost_crypt(hba, on);
+               if (!ufshcd_is_clkscaling_supported(hba))
+                       ufs_mtk_scale_perf(hba, on);
                ufs_mtk_setup_ref_clk(hba, on);
                phy_power_off(host->mphy);
        }
@@ -870,6 +876,10 @@ static int ufs_mtk_init(struct ufs_hba *hba)
 
        host->ip_ver = ufshcd_readl(hba, REG_UFS_MTK_IP_VER);
 
+       /* Initialize pm-qos request */
+       cpu_latency_qos_add_request(&host->pm_qos_req, PM_QOS_DEFAULT_VALUE);
+       host->pm_qos_init = true;
+
        goto out;
 
 out_variant_clear: