scsi: ufs: Stop hardcoding the scale down gear

Instead of hardcoding the scale down gear, make it a member of
the ufs_clk_scaling struct.

Link: https://lore.kernel.org/r/1606442334-22641-1-git-send-email-cang@codeaurora.org
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 17f4e63..11a4aad 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1114,7 +1114,6 @@ out:
  */
 static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
 {
-       #define UFS_MIN_GEAR_TO_SCALE_DOWN      UFS_HS_G1
        int ret = 0;
        struct ufs_pa_layer_attr new_pwr_info;
 
@@ -1125,16 +1124,16 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
                memcpy(&new_pwr_info, &hba->pwr_info,
                       sizeof(struct ufs_pa_layer_attr));
 
-               if (hba->pwr_info.gear_tx > UFS_MIN_GEAR_TO_SCALE_DOWN
-                   || hba->pwr_info.gear_rx > UFS_MIN_GEAR_TO_SCALE_DOWN) {
+               if (hba->pwr_info.gear_tx > hba->clk_scaling.min_gear ||
+                   hba->pwr_info.gear_rx > hba->clk_scaling.min_gear) {
                        /* save the current power mode */
                        memcpy(&hba->clk_scaling.saved_pwr_info.info,
                                &hba->pwr_info,
                                sizeof(struct ufs_pa_layer_attr));
 
                        /* scale down gear */
-                       new_pwr_info.gear_tx = UFS_MIN_GEAR_TO_SCALE_DOWN;
-                       new_pwr_info.gear_rx = UFS_MIN_GEAR_TO_SCALE_DOWN;
+                       new_pwr_info.gear_tx = hba->clk_scaling.min_gear;
+                       new_pwr_info.gear_rx = hba->clk_scaling.min_gear;
                }
        }
 
@@ -1842,6 +1841,9 @@ static void ufshcd_init_clk_scaling(struct ufs_hba *hba)
        if (!ufshcd_is_clkscaling_supported(hba))
                return;
 
+       if (!hba->clk_scaling.min_gear)
+               hba->clk_scaling.min_gear = UFS_HS_G1;
+
        INIT_WORK(&hba->clk_scaling.suspend_work,
                  ufshcd_clk_scaling_suspend_work);
        INIT_WORK(&hba->clk_scaling.resume_work,

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 3a8bd7a..7a7e056 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -390,6 +390,7 @@ struct ufs_saved_pwr_info {
  * @workq: workqueue to schedule devfreq suspend/resume work
  * @suspend_work: worker to suspend devfreq
  * @resume_work: worker to resume devfreq
+ * @min_gear: lowest HS gear to scale down to
  * @is_allowed: tracks if scaling is currently allowed or not
  * @is_busy_started: tracks if busy period has started or not
  * @is_suspended: tracks if devfreq is suspended or not
@@ -404,6 +405,7 @@ struct ufs_clk_scaling {
        struct workqueue_struct *workq;
        struct work_struct suspend_work;
        struct work_struct resume_work;
+       u32 min_gear;
        bool is_allowed;
        bool is_busy_started;
        bool is_suspended;