From: Lukasz Majewski <l.majewski@samsung.com>
To: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Rafael Wysocki <rjw@rjwysocki.net>,
"edubezval@gmail.com" <edubezval@gmail.com>,
"linaro-kernel@lists.linaro.org" <linaro-kernel@lists.linaro.org>,
"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>
Subject: Re: [PATCH V2 4/4] cpufreq-dt: register cooling device from ->ready() callback
Date: Thu, 27 Nov 2014 12:08:15 +0100 [thread overview]
Message-ID: <20141127120815.019cd529@amdc2363> (raw)
In-Reply-To: <9ea95c03d129b45140948d94cc4ebcf1bcbbac44.1417048449.git.viresh.kumar@linaro.org>
Hi Viresh,
> Currently we are calling of_cpufreq_cooling_register() from ->init()
> callback. At this point of time cpufreq driver's policy isn't
> completely ready to be used as few of its fields/structure/pointers
> aren't yet initialized.
>
> Because of_cpufreq_cooling_register() tries to access policy with
> help of cpufreq_cpu_get() and then tries to get freq-table as well,
> these calls fail.
>
> To fix this, register the cooling device after the policy is ready to
> be used. And the right callback for it is the newly added ->ready()
> one.
>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> Reviewed-by: Eduardo Valentin <edubezval@gmail.com>
> Tested-by: Eduardo Valentin <edubezval@gmail.com>
> ---
> drivers/cpufreq/cpufreq-dt.c | 51
> +++++++++++++++++++++++++++----------------- 1 file changed, 32
> insertions(+), 19 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq-dt.c
> b/drivers/cpufreq/cpufreq-dt.c index 7374fc4..e720954 100644
> --- a/drivers/cpufreq/cpufreq-dt.c
> +++ b/drivers/cpufreq/cpufreq-dt.c
> @@ -186,7 +186,6 @@ static int cpufreq_init(struct cpufreq_policy
> *policy) {
> struct cpufreq_dt_platform_data *pd;
> struct cpufreq_frequency_table *freq_table;
> - struct thermal_cooling_device *cdev;
> struct device_node *np;
> struct private_data *priv;
> struct device *cpu_dev;
> @@ -269,20 +268,6 @@ static int cpufreq_init(struct cpufreq_policy
> *policy) goto out_free_priv;
> }
>
> - /*
> - * For now, just loading the cooling device;
> - * thermal DT code takes care of matching them.
> - */
> - if (of_find_property(np, "#cooling-cells", NULL)) {
> - cdev = of_cpufreq_cooling_register(np,
> policy->related_cpus);
> - if (IS_ERR(cdev))
> - dev_err(cpu_dev,
> - "running cpufreq without cooling
> device: %ld\n",
> - PTR_ERR(cdev));
> - else
> - priv->cdev = cdev;
> - }
> -
> priv->cpu_dev = cpu_dev;
> priv->cpu_reg = cpu_reg;
> policy->driver_data = priv;
> @@ -292,7 +277,7 @@ static int cpufreq_init(struct cpufreq_policy
> *policy) if (ret) {
> dev_err(cpu_dev, "%s: invalid frequency table:
> %d\n", __func__, ret);
> - goto out_cooling_unregister;
> + goto out_free_cpufreq_table;
> }
>
> policy->cpuinfo.transition_latency = transition_latency;
> @@ -305,8 +290,7 @@ static int cpufreq_init(struct cpufreq_policy
> *policy)
> return 0;
>
> -out_cooling_unregister:
> - cpufreq_cooling_unregister(priv->cdev);
> +out_free_cpufreq_table:
> dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
> out_free_priv:
> kfree(priv);
> @@ -324,7 +308,8 @@ static int cpufreq_exit(struct cpufreq_policy
> *policy) {
> struct private_data *priv = policy->driver_data;
>
> - cpufreq_cooling_unregister(priv->cdev);
> + if (priv->cdev)
> + cpufreq_cooling_unregister(priv->cdev);
> dev_pm_opp_free_cpufreq_table(priv->cpu_dev,
> &policy->freq_table); clk_put(policy->clk);
> if (!IS_ERR(priv->cpu_reg))
> @@ -334,6 +319,33 @@ static int cpufreq_exit(struct cpufreq_policy
> *policy) return 0;
> }
>
> +static void cpufreq_ready(struct cpufreq_policy *policy)
> +{
> + struct private_data *priv = policy->driver_data;
> + struct device_node *np = of_node_get(priv->cpu_dev->of_node);
> +
> + if (WARN_ON(!np))
> + return;
> +
> + /*
> + * For now, just loading the cooling device;
> + * thermal DT code takes care of matching them.
> + */
> + if (of_find_property(np, "#cooling-cells", NULL)) {
> + priv->cdev = of_cpufreq_cooling_register(np,
> +
> policy->related_cpus);
> + if (IS_ERR(priv->cdev)) {
> + dev_err(priv->cpu_dev,
> + "running cpufreq without cooling
> device: %ld\n",
> + PTR_ERR(priv->cdev));
> +
> + priv->cdev = NULL;
> + }
> + }
> +
> + of_node_put(np);
> +}
> +
> static struct cpufreq_driver dt_cpufreq_driver = {
> .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK,
> .verify = cpufreq_generic_frequency_table_verify,
> @@ -341,6 +353,7 @@ static struct cpufreq_driver dt_cpufreq_driver = {
> .get = cpufreq_generic_get,
> .init = cpufreq_init,
> .exit = cpufreq_exit,
> + .ready = cpufreq_ready,
> .name = "cpufreq-dt",
> .attr = cpufreq_generic_attr,
> };
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
prev parent reply other threads:[~2014-11-27 11:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 0:37 [PATCH V2 0/4] cpufreq: Register cooling device after policy is ready Viresh Kumar
2014-11-27 0:37 ` [PATCH V2 1/4] cpufreq: Fix formatting issues in 'struct cpufreq_driver' Viresh Kumar
2014-11-27 0:37 ` [PATCH V2 2/4] cpufreq-dt: pass 'policy->related_cpus' to of_cpufreq_cooling_register() Viresh Kumar
2014-11-27 0:37 ` [PATCH V2 3/4] cpufreq: Introduce ->ready() callback for cpufreq drivers Viresh Kumar
2014-11-27 11:00 ` Lukasz Majewski
2014-11-27 0:37 ` [PATCH V2 4/4] cpufreq-dt: register cooling device from ->ready() callback Viresh Kumar
2014-11-27 11:08 ` Lukasz Majewski [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=20141127120815.019cd529@amdc2363 \
--to=l.majewski@samsung.com \
--cc=edubezval@gmail.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--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).