From: Can Guo <cang@codeaurora.org>
To: Stanley Chu <stanley.chu@mediatek.com>
Cc: linux-scsi@vger.kernel.org, martin.petersen@oracle.com,
avri.altman@wdc.com, alim.akhtar@samsung.com, jejb@linux.ibm.com,
beanhuo@micron.com, asutoshd@codeaurora.org,
matthias.bgg@gmail.com, bvanassche@acm.org,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kuohong.wang@mediatek.com,
peter.wang@mediatek.com, chun-hung.wu@mediatek.com,
andy.teng@mediatek.com, chaotian.jing@mediatek.com,
cc.chou@mediatek.com, jiajie.hao@mediatek.com,
alice.chao@mediatek.com
Subject: Re: [PATCH v2 3/4] scsi: ufs: Cleanup and refactor clk-scaling feature
Date: Fri, 18 Dec 2020 14:16:09 +0800 [thread overview]
Message-ID: <cda3a961b396c48e95b32dd70961ef1b@codeaurora.org> (raw)
In-Reply-To: <20201216131639.4128-4-stanley.chu@mediatek.com>
On 2020-12-16 21:16, Stanley Chu wrote:
> Manipulate clock scaling related stuff only if the host capability
> supports clock scaling feature to avoid redundant code execution.
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> ---
> drivers/scsi/ufs/ufshcd.c | 64 ++++++++++++++++++++-------------------
> 1 file changed, 33 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 9cc16598136d..ce0528f2e2ed 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -1448,9 +1448,6 @@ static void ufshcd_suspend_clkscaling(struct
> ufs_hba *hba)
> unsigned long flags;
> bool suspend = false;
>
> - if (!ufshcd_is_clkscaling_supported(hba))
> - return;
> -
> cancel_work_sync(&hba->clk_scaling.suspend_work);
> cancel_work_sync(&hba->clk_scaling.resume_work);
>
> @@ -1470,9 +1467,6 @@ static void ufshcd_resume_clkscaling(struct
> ufs_hba *hba)
> unsigned long flags;
> bool resume = false;
>
> - if (!ufshcd_is_clkscaling_supported(hba))
> - return;
> -
> spin_lock_irqsave(hba->host->host_lock, flags);
> if (hba->clk_scaling.is_suspended) {
> resume = true;
> @@ -5642,6 +5636,26 @@ static inline void
> ufshcd_schedule_eh_work(struct ufs_hba *hba)
> }
> }
>
> +static void ufshcd_clk_scaling_allow(struct ufs_hba *hba, bool allow)
> +{
> + down_write(&hba->clk_scaling_lock);
> + hba->clk_scaling.is_allowed = allow;
> + up_write(&hba->clk_scaling_lock);
> +}
> +
> +static void ufshcd_clk_scaling_suspend(struct ufs_hba *hba, bool
> suspend)
> +{
> + if (suspend) {
> + if (hba->clk_scaling.is_enabled)
> + ufshcd_suspend_clkscaling(hba);
> + ufshcd_clk_scaling_allow(hba, false);
> + } else {
> + ufshcd_clk_scaling_allow(hba, true);
> + if (hba->clk_scaling.is_enabled)
> + ufshcd_resume_clkscaling(hba);
> + }
> +}
> +
> static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
> {
> pm_runtime_get_sync(hba->dev);
> @@ -5663,23 +5677,20 @@ static void ufshcd_err_handling_prepare(struct
> ufs_hba *hba)
> ufshcd_vops_resume(hba, UFS_RUNTIME_PM);
> } else {
> ufshcd_hold(hba, false);
> - if (hba->clk_scaling.is_enabled)
> + if (ufshcd_is_clkscaling_supported(hba) &&
> + hba->clk_scaling.is_enabled)
> ufshcd_suspend_clkscaling(hba);
> }
> - down_write(&hba->clk_scaling_lock);
> - hba->clk_scaling.is_allowed = false;
> - up_write(&hba->clk_scaling_lock);
> + ufshcd_clk_scaling_allow(hba, false);
> }
>
> static void ufshcd_err_handling_unprepare(struct ufs_hba *hba)
> {
> ufshcd_release(hba);
>
> - down_write(&hba->clk_scaling_lock);
> - hba->clk_scaling.is_allowed = true;
> - up_write(&hba->clk_scaling_lock);
> - if (hba->clk_scaling.is_enabled)
> - ufshcd_resume_clkscaling(hba);
> + if (ufshcd_is_clkscaling_supported(hba))
> + ufshcd_clk_scaling_suspend(hba, false);
> +
> pm_runtime_put(hba->dev);
> }
>
> @@ -8507,12 +8518,8 @@ static int ufshcd_suspend(struct ufs_hba *hba,
> enum ufs_pm_op pm_op)
> ufshcd_hold(hba, false);
> hba->clk_gating.is_suspended = true;
>
> - if (hba->clk_scaling.is_enabled)
> - ufshcd_suspend_clkscaling(hba);
> -
> - down_write(&hba->clk_scaling_lock);
> - hba->clk_scaling.is_allowed = false;
> - up_write(&hba->clk_scaling_lock);
> + if (ufshcd_is_clkscaling_supported(hba))
> + ufshcd_clk_scaling_suspend(hba, true);
>
> if (req_dev_pwr_mode == UFS_ACTIVE_PWR_MODE &&
> req_link_state == UIC_LINK_ACTIVE_STATE) {
> @@ -8618,11 +8625,9 @@ static int ufshcd_suspend(struct ufs_hba *hba,
> enum ufs_pm_op pm_op)
> if (!ufshcd_set_dev_pwr_mode(hba, UFS_ACTIVE_PWR_MODE))
> ufshcd_disable_auto_bkops(hba);
> enable_gating:
> - down_write(&hba->clk_scaling_lock);
> - hba->clk_scaling.is_allowed = true;
> - up_write(&hba->clk_scaling_lock);
> - if (hba->clk_scaling.is_enabled)
> - ufshcd_resume_clkscaling(hba);
> + if (ufshcd_is_clkscaling_supported(hba))
> + ufshcd_clk_scaling_suspend(hba, false);
> +
> hba->clk_gating.is_suspended = false;
> hba->dev_info.b_rpm_dev_flush_capable = false;
> ufshcd_release(hba);
> @@ -8719,11 +8724,8 @@ static int ufshcd_resume(struct ufs_hba *hba,
> enum ufs_pm_op pm_op)
>
> hba->clk_gating.is_suspended = false;
>
> - down_write(&hba->clk_scaling_lock);
> - hba->clk_scaling.is_allowed = true;
> - up_write(&hba->clk_scaling_lock);
> - if (hba->clk_scaling.is_enabled)
> - ufshcd_resume_clkscaling(hba);
> + if (ufshcd_is_clkscaling_supported(hba))
> + ufshcd_clk_scaling_suspend(hba, false);
>
> /* Enable Auto-Hibernate if configured */
> ufshcd_auto_hibern8_enable(hba);
Thanks for the cleanup
Reviewed-by: Can Guo <cang@codeaurora.org>
next prev parent reply other threads:[~2020-12-18 6:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 13:16 [PATCH v2 0/4] scsi: ufs: Cleanup and refactor clock scaling Stanley Chu
2020-12-16 13:16 ` [PATCH v2 1/4] scsi: ufs: Refactor cancelling clkscaling works Stanley Chu
2020-12-18 6:08 ` Can Guo
2020-12-16 13:16 ` [PATCH v2 2/4] scsi: ufs: Remove redundant null checking of devfreq instance Stanley Chu
2020-12-18 5:58 ` Can Guo
2020-12-18 6:09 ` Can Guo
2020-12-16 13:16 ` [PATCH v2 3/4] scsi: ufs: Cleanup and refactor clk-scaling feature Stanley Chu
2020-12-18 6:16 ` Can Guo [this message]
2020-12-16 13:16 ` [PATCH v2 4/4] scsi: ufs: Fix build warning by incorrect function description Stanley Chu
2020-12-18 6:16 ` Can Guo
2020-12-18 6:20 ` [PATCH v2 0/4] scsi: ufs: Cleanup and refactor clock scaling Can Guo
2020-12-18 6:24 ` Stanley Chu
2020-12-18 6:30 ` Can Guo
2021-01-06 2:47 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cda3a961b396c48e95b32dd70961ef1b@codeaurora.org \
--to=cang@codeaurora.org \
--cc=alice.chao@mediatek.com \
--cc=alim.akhtar@samsung.com \
--cc=andy.teng@mediatek.com \
--cc=asutoshd@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=cc.chou@mediatek.com \
--cc=chaotian.jing@mediatek.com \
--cc=chun-hung.wu@mediatek.com \
--cc=jejb@linux.ibm.com \
--cc=jiajie.hao@mediatek.com \
--cc=kuohong.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=matthias.bgg@gmail.com \
--cc=peter.wang@mediatek.com \
--cc=stanley.chu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome