From: Dmitry Osipenko <digetx@gmail.com>
To: Viresh Kumar <viresh.kumar@linaro.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
linux-tegra@vger.kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] cpufreq: tegra20: Fix imbalanced clock enable count
Date: Wed, 23 May 2018 17:46:25 +0300 [thread overview]
Message-ID: <4521eab5-70a5-90e9-65f3-d6548310a54e@gmail.com> (raw)
In-Reply-To: <68f62691-9108-9bee-a24d-5c978af8a5ab@gmail.com>
On 23.05.2018 13:44, Dmitry Osipenko wrote:
> On 23.05.2018 08:58, Viresh Kumar wrote:
>> On 23-05-18, 00:14, Dmitry Osipenko wrote:
>>> Tegra20-cpufreq driver missed enabling the CPU clocks. This results in a
>>> clock-enable refcount disbalance on PLL_P <-> PLL_X reparent, causing
>>> PLL_X to get disabled while it shouldn't. Fix this by enabling the clocks
>>> on the driver probe.
>>>
>>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>>> ---
>>>
>>> CPUFreq maintainers,
>>>
>>> Please take into account that this patch is made on top of my recent
>>> series of patches [0] "Clean up Tegra20 cpufreq driver" that was fully
>>> reviewed, but seems not applied yet. Let me know if you prefer to re-spin
>>> the [0], including this patch into the series.
>>>
>>> [0] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=45321
>>
>> This is already picked by Rafael and is sitting in pm/bleeding-edge
>> branch. Should get merged into linux-next in a day or two.
>>
>>> drivers/cpufreq/tegra20-cpufreq.c | 16 +++++++++++++++-
>>> 1 file changed, 15 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
>>> index 05f57dcd5215..ca5229265b60 100644
>>> --- a/drivers/cpufreq/tegra20-cpufreq.c
>>> +++ b/drivers/cpufreq/tegra20-cpufreq.c
>>> @@ -176,6 +176,14 @@ static int tegra20_cpufreq_probe(struct platform_device *pdev)
>>> goto put_pll_x;
>>> }
>>>
>>> + err = clk_prepare_enable(cpufreq->pll_x_clk);
>>> + if (err)
>>> + goto put_pll_p;
>>> +
>>> + err = clk_prepare_enable(cpufreq->pll_p_clk);
>>> + if (err)
>>> + goto disable_pll_x;
>>> +
>>> cpufreq->dev = &pdev->dev;
>>> cpufreq->driver.get = cpufreq_generic_get;
>>> cpufreq->driver.attr = cpufreq_generic_attr;
>>> @@ -192,12 +200,16 @@ static int tegra20_cpufreq_probe(struct platform_device *pdev)
>>>
>>> err = cpufreq_register_driver(&cpufreq->driver);
>>> if (err)
>>> - goto put_pll_p;
>>> + goto disable_pll_p;
>>>
>>> platform_set_drvdata(pdev, cpufreq);
>>>
>>> return 0;
>>>
>>> +disable_pll_p:
>>> + clk_disable_unprepare(cpufreq->pll_p_clk);
>>> +disable_pll_x:
>>> + clk_disable_unprepare(cpufreq->pll_x_clk);
>>> put_pll_p:
>>> clk_put(cpufreq->pll_p_clk);
>>> put_pll_x:
>>> @@ -214,6 +226,8 @@ static int tegra20_cpufreq_remove(struct platform_device *pdev)
>>>
>>> cpufreq_unregister_driver(&cpufreq->driver);
>>>
>>> + clk_disable_unprepare(cpufreq->pll_p_clk);
>>> + clk_disable_unprepare(cpufreq->pll_x_clk);
>>> clk_put(cpufreq->pll_p_clk);
>>> clk_put(cpufreq->pll_x_clk);
>>> clk_put(cpufreq->cpu_clk);
>>
>> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>>
>
> Please hold on this patch, seems I interpreted the cpufreq driver logic
> incorrectly and it is probably fine as it is. I'll re-check later today.
>
I've re-checked the driver and it is fine, PLL_X disabling is expected on a
switching parent clock to PLL_P as for the target frequency. This patch isn't
needed, please scratch it.
It occurred to me that the driver could be improved further a tad while I was
performing the re-check, hence likely there will be couple more patches from me.
prev parent reply other threads:[~2018-05-23 14:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 21:14 [PATCH v1] cpufreq: tegra20: Fix imbalanced clock enable count Dmitry Osipenko
2018-05-23 5:58 ` Viresh Kumar
2018-05-23 9:30 ` Dmitry Osipenko
2018-05-24 9:36 ` Rafael J. Wysocki
2018-05-24 12:18 ` Dmitry Osipenko
2018-05-23 10:44 ` Dmitry Osipenko
2018-05-23 14:46 ` Dmitry Osipenko [this message]
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=4521eab5-70a5-90e9-65f3-d6548310a54e@gmail.com \
--to=digetx@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=thierry.reding@gmail.com \
--cc=viresh.kumar@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).