The initialization of clk_scaling.min_gear was removed by mistake. This
change adds it back, otherwise clock scaling down would fail.
Fixes: 4543d9d78227 ("scsi: ufs: Refactor ufshcd_init/exit_clk_scaling/gating()")
Signed-off-by: Can Guo <[email protected]>
---
drivers/scsi/ufs/ufshcd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 36bcbb3..8ef6796 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1602,6 +1602,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,
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
On Wed, 2021-01-27 at 18:49 -0800, Can Guo wrote:
> The initialization of clk_scaling.min_gear was removed by mistake. This
> change adds it back, otherwise clock scaling down would fail.
>
> Fixes: 4543d9d78227 ("scsi: ufs: Refactor ufshcd_init/exit_clk_scaling/gating()")
>
> Signed-off-by: Can Guo <[email protected]>
Reviewed-by: Stanley Chu <[email protected]>
On Wed 27 Jan 20:49 CST 2021, Can Guo wrote:
> The initialization of clk_scaling.min_gear was removed by mistake. This
> change adds it back, otherwise clock scaling down would fail.
>
Thanks for the patch Can, it solves the problem I'm seeing!
Reviewed-by: Bjorn Andersson <[email protected]>
Tested-by: Bjorn Andersson <[email protected]>
And perhaps a:
Reported-by: Bjorn Andersson <[email protected]>
Regards,
Bjorn
> Fixes: 4543d9d78227 ("scsi: ufs: Refactor ufshcd_init/exit_clk_scaling/gating()")
>
> Signed-off-by: Can Guo <[email protected]>
> ---
> drivers/scsi/ufs/ufshcd.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 36bcbb3..8ef6796 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -1602,6 +1602,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,
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
>
On 2021-01-28 11:28, Bjorn Andersson wrote:
> On Wed 27 Jan 20:49 CST 2021, Can Guo wrote:
>
>> The initialization of clk_scaling.min_gear was removed by mistake.
>> This
>> change adds it back, otherwise clock scaling down would fail.
>>
>
> Thanks for the patch Can, it solves the problem I'm seeing!
>
> Reviewed-by: Bjorn Andersson <[email protected]>
> Tested-by: Bjorn Andersson <[email protected]>
>
>
> And perhaps a:
>
> Reported-by: Bjorn Andersson <[email protected]>
>
I missed the two lines due to I was not working on the latest
scsi code tip - I should have tested it based on commit 29b87e92a216
("scsi: ufs: Stop hardcoding the scale down gear"), my bad.
Anyways, thanks for the test!
Regards,
Can Guo.
> Regards,
> Bjorn
>
>> Fixes: 4543d9d78227 ("scsi: ufs: Refactor
>> ufshcd_init/exit_clk_scaling/gating()")
>>
>> Signed-off-by: Can Guo <[email protected]>
>> ---
>> drivers/scsi/ufs/ufshcd.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
>> index 36bcbb3..8ef6796 100644
>> --- a/drivers/scsi/ufs/ufshcd.c
>> +++ b/drivers/scsi/ufs/ufshcd.c
>> @@ -1602,6 +1602,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,
>> --
>> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a
>> Linux Foundation Collaborative Project.
>>
On Wed, 2021-01-27 at 18:49 -0800, Can Guo wrote:
> The initialization of clk_scaling.min_gear was removed by mistake.
> This
> change adds it back, otherwise clock scaling down would fail.
>
> Fixes: 4543d9d78227 ("scsi: ufs: Refactor
> ufshcd_init/exit_clk_scaling/gating()")
>
> Signed-off-by: Can Guo <[email protected]>
Reviewed-by: Bean Huo <[email protected]>
Tested-by: Bean Huo <[email protected]>
Can,
> The initialization of clk_scaling.min_gear was removed by mistake. This
> change adds it back, otherwise clock scaling down would fail.
Applied to 5.12/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering