From: Peter De Schrijver <pdeschrijver@nvidia.com>
To: Dmitry Osipenko <digetx@gmail.com>
Cc: Michael Turquette <mturquette@baylibre.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
"Prashant Gaikwad" <pgaikwad@nvidia.com>,
Stephen Boyd <sboyd@kernel.org>, <linux-clk@vger.kernel.org>,
<linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v1] clk: tegra20/30: Optimize PLLX configuration restoring
Date: Mon, 28 Oct 2019 16:47:08 +0200 [thread overview]
Message-ID: <20191028144708.GE27141@pdeschrijver-desktop.Nvidia.com> (raw)
In-Reply-To: <20190922215203.32103-1-digetx@gmail.com>
On Mon, Sep 23, 2019 at 12:52:03AM +0300, Dmitry Osipenko wrote:
> There is no need to re-configure PLLX if its configuration in unchanged
> on return from suspend / cpuidle, this saves 300us if PLLX is already
> enabled (common case for cpuidle).
>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
> ---
> drivers/clk/tegra/clk-tegra20.c | 25 ++++++++++++++++---------
> drivers/clk/tegra/clk-tegra30.c | 25 ++++++++++++++++---------
> 2 files changed, 32 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c
> index cceefbd67a3b..4d8222f5c638 100644
> --- a/drivers/clk/tegra/clk-tegra20.c
> +++ b/drivers/clk/tegra/clk-tegra20.c
> @@ -955,6 +955,7 @@ static void tegra20_cpu_clock_suspend(void)
> static void tegra20_cpu_clock_resume(void)
> {
> unsigned int reg, policy;
> + u32 misc, base;
>
> /* Is CPU complex already running on PLLX? */
> reg = readl(clk_base + CCLK_BURST_POLICY);
> @@ -968,15 +969,21 @@ static void tegra20_cpu_clock_resume(void)
> BUG();
>
> if (reg != CCLK_BURST_POLICY_PLLX) {
> - /* restore PLLX settings if CPU is on different PLL */
> - writel(tegra20_cpu_clk_sctx.pllx_misc,
> - clk_base + PLLX_MISC);
> - writel(tegra20_cpu_clk_sctx.pllx_base,
> - clk_base + PLLX_BASE);
> -
> - /* wait for PLL stabilization if PLLX was enabled */
> - if (tegra20_cpu_clk_sctx.pllx_base & (1 << 30))
> - udelay(300);
> + misc = readl_relaxed(clk_base + PLLX_MISC);
> + base = readl_relaxed(clk_base + PLLX_BASE);
> +
> + if (misc != tegra20_cpu_clk_sctx.pllx_misc ||
> + base != tegra20_cpu_clk_sctx.pllx_base) {
> + /* restore PLLX settings if CPU is on different PLL */
> + writel(tegra20_cpu_clk_sctx.pllx_misc,
> + clk_base + PLLX_MISC);
> + writel(tegra20_cpu_clk_sctx.pllx_base,
> + clk_base + PLLX_BASE);
> +
> + /* wait for PLL stabilization if PLLX was enabled */
> + if (tegra20_cpu_clk_sctx.pllx_base & (1 << 30))
> + udelay(300);
> + }
> }
>
> /*
> diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
> index a19840fac716..3b5bca44b7aa 100644
> --- a/drivers/clk/tegra/clk-tegra30.c
> +++ b/drivers/clk/tegra/clk-tegra30.c
> @@ -1135,6 +1135,7 @@ static void tegra30_cpu_clock_suspend(void)
> static void tegra30_cpu_clock_resume(void)
> {
> unsigned int reg, policy;
> + u32 misc, base;
>
> /* Is CPU complex already running on PLLX? */
> reg = readl(clk_base + CLK_RESET_CCLK_BURST);
> @@ -1148,15 +1149,21 @@ static void tegra30_cpu_clock_resume(void)
> BUG();
>
> if (reg != CLK_RESET_CCLK_BURST_POLICY_PLLX) {
> - /* restore PLLX settings if CPU is on different PLL */
> - writel(tegra30_cpu_clk_sctx.pllx_misc,
> - clk_base + CLK_RESET_PLLX_MISC);
> - writel(tegra30_cpu_clk_sctx.pllx_base,
> - clk_base + CLK_RESET_PLLX_BASE);
> -
> - /* wait for PLL stabilization if PLLX was enabled */
> - if (tegra30_cpu_clk_sctx.pllx_base & (1 << 30))
> - udelay(300);
> + misc = readl_relaxed(clk_base + CLK_RESET_PLLX_MISC);
> + base = readl_relaxed(clk_base + CLK_RESET_PLLX_BASE);
> +
> + if (misc != tegra30_cpu_clk_sctx.pllx_misc ||
> + base != tegra30_cpu_clk_sctx.pllx_base) {
> + /* restore PLLX settings if CPU is on different PLL */
> + writel(tegra30_cpu_clk_sctx.pllx_misc,
> + clk_base + CLK_RESET_PLLX_MISC);
> + writel(tegra30_cpu_clk_sctx.pllx_base,
> + clk_base + CLK_RESET_PLLX_BASE);
> +
> + /* wait for PLL stabilization if PLLX was enabled */
> + if (tegra30_cpu_clk_sctx.pllx_base & (1 << 30))
> + udelay(300);
> + }
> }
>
> /*
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-10-28 14:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-22 21:52 Dmitry Osipenko
2019-10-28 14:47 ` Peter De Schrijver [this message]
2019-10-29 13:17 ` Thierry Reding
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=20191028144708.GE27141@pdeschrijver-desktop.Nvidia.com \
--to=pdeschrijver@nvidia.com \
--cc=digetx@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=pgaikwad@nvidia.com \
--cc=sboyd@kernel.org \
--cc=thierry.reding@gmail.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
all inboxes | Powered by JetHome®