* [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend
@ 2016-04-18 7:59 Jia Hongtao
2016-04-18 7:59 ` [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined Jia Hongtao
2016-04-18 10:32 ` [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Viresh Kumar
0 siblings, 2 replies; 6+ messages in thread
From: Jia Hongtao @ 2016-04-18 7:59 UTC (permalink / raw)
To: viresh.kumar, linux-pm
Cc: linuxppc-dev, scott.wood, yuantian.tang, hongtao.jia
Cooling device is registered by ready callback. It's also invoked while
system resuming from sleep (Enabling non-boot cpus). Thus cooling device
may be multiple registered. Stop_cpu callback is invoked during suspend
(Disabling non-boot cpus). So matchable unregistration is added to fix
this issue.
Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
---
drivers/cpufreq/qoriq-cpufreq.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index b23e525..1c2fdc1 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -305,6 +305,7 @@ static int __exit qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
{
struct cpu_data *data = policy->driver_data;
+ cpufreq_cooling_unregister(data->cdev);
kfree(data->pclk);
kfree(data->table);
kfree(data);
@@ -323,6 +324,12 @@ static int qoriq_cpufreq_target(struct cpufreq_policy *policy,
return clk_set_parent(policy->clk, parent);
}
+static void qoriq_cpufreq_stop_cpu(struct cpufreq_policy *policy)
+{
+ struct cpu_data *cpud = policy->driver_data;
+
+ cpufreq_cooling_unregister(cpud->cdev);
+}
static void qoriq_cpufreq_ready(struct cpufreq_policy *policy)
{
@@ -352,6 +359,7 @@ static struct cpufreq_driver qoriq_cpufreq_driver = {
.verify = cpufreq_generic_frequency_table_verify,
.target_index = qoriq_cpufreq_target,
.get = cpufreq_generic_get,
+ .stop_cpu = qoriq_cpufreq_stop_cpu,
.ready = qoriq_cpufreq_ready,
.attr = cpufreq_generic_attr,
};
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined
2016-04-18 7:59 [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Jia Hongtao
@ 2016-04-18 7:59 ` Jia Hongtao
2016-04-18 10:33 ` Viresh Kumar
2016-04-18 10:32 ` [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Viresh Kumar
1 sibling, 1 reply; 6+ messages in thread
From: Jia Hongtao @ 2016-04-18 7:59 UTC (permalink / raw)
To: viresh.kumar, linux-pm
Cc: linuxppc-dev, scott.wood, yuantian.tang, hongtao.jia
When THERMAL_OF is undefined the cooling device messages should not be
shown. -ENOSYS is returned from of_cpufreq_cooling_register() when
THERMAL_OF is undefined.
Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
---
drivers/cpufreq/qoriq-cpufreq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index 1c2fdc1..ff8da83 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -340,8 +340,8 @@ static void qoriq_cpufreq_ready(struct cpufreq_policy *policy)
cpud->cdev = of_cpufreq_cooling_register(np,
policy->related_cpus);
- if (IS_ERR(cpud->cdev)) {
- pr_err("Failed to register cooling device cpu%d: %ld\n",
+ if (IS_ERR(cpud->cdev) && PTR_ERR(cpud->cdev) != -ENOSYS) {
+ pr_err("cpu%d is not running as cooling device: %ld\n",
policy->cpu, PTR_ERR(cpud->cdev));
cpud->cdev = NULL;
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend
2016-04-18 7:59 [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Jia Hongtao
2016-04-18 7:59 ` [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined Jia Hongtao
@ 2016-04-18 10:32 ` Viresh Kumar
2016-04-19 6:52 ` 答复: " Hongtao Jia
1 sibling, 1 reply; 6+ messages in thread
From: Viresh Kumar @ 2016-04-18 10:32 UTC (permalink / raw)
To: Jia Hongtao; +Cc: linux-pm, linuxppc-dev, scott.wood, yuantian.tang
On 18-04-16, 15:59, Jia Hongtao wrote:
> Cooling device is registered by ready callback. It's also invoked while
> system resuming from sleep (Enabling non-boot cpus). Thus cooling device
> may be multiple registered. Stop_cpu callback is invoked during suspend
> (Disabling non-boot cpus). So matchable unregistration is added to fix
> this issue.
>
> Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
> ---
> drivers/cpufreq/qoriq-cpufreq.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
> index b23e525..1c2fdc1 100644
> --- a/drivers/cpufreq/qoriq-cpufreq.c
> +++ b/drivers/cpufreq/qoriq-cpufreq.c
> @@ -305,6 +305,7 @@ static int __exit qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
> {
> struct cpu_data *data = policy->driver_data;
>
> + cpufreq_cooling_unregister(data->cdev);
> kfree(data->pclk);
> kfree(data->table);
> kfree(data);
> @@ -323,6 +324,12 @@ static int qoriq_cpufreq_target(struct cpufreq_policy *policy,
> return clk_set_parent(policy->clk, parent);
> }
>
> +static void qoriq_cpufreq_stop_cpu(struct cpufreq_policy *policy)
> +{
> + struct cpu_data *cpud = policy->driver_data;
> +
> + cpufreq_cooling_unregister(cpud->cdev);
> +}
>
> static void qoriq_cpufreq_ready(struct cpufreq_policy *policy)
> {
> @@ -352,6 +359,7 @@ static struct cpufreq_driver qoriq_cpufreq_driver = {
> .verify = cpufreq_generic_frequency_table_verify,
> .target_index = qoriq_cpufreq_target,
> .get = cpufreq_generic_get,
> + .stop_cpu = qoriq_cpufreq_stop_cpu,
> .ready = qoriq_cpufreq_ready,
> .attr = cpufreq_generic_attr,
> };
You don't need to do it from stop_cpu(), please use
qoriq_cpufreq_cpu_exit() for this.
--
viresh
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined
2016-04-18 7:59 ` [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined Jia Hongtao
@ 2016-04-18 10:33 ` Viresh Kumar
2016-04-26 0:02 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Viresh Kumar @ 2016-04-18 10:33 UTC (permalink / raw)
To: Jia Hongtao; +Cc: linux-pm, linuxppc-dev, scott.wood, yuantian.tang
On 18-04-16, 15:59, Jia Hongtao wrote:
> When THERMAL_OF is undefined the cooling device messages should not be
> shown. -ENOSYS is returned from of_cpufreq_cooling_register() when
> THERMAL_OF is undefined.
>
> Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
> ---
> drivers/cpufreq/qoriq-cpufreq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
> index 1c2fdc1..ff8da83 100644
> --- a/drivers/cpufreq/qoriq-cpufreq.c
> +++ b/drivers/cpufreq/qoriq-cpufreq.c
> @@ -340,8 +340,8 @@ static void qoriq_cpufreq_ready(struct cpufreq_policy *policy)
> cpud->cdev = of_cpufreq_cooling_register(np,
> policy->related_cpus);
>
> - if (IS_ERR(cpud->cdev)) {
> - pr_err("Failed to register cooling device cpu%d: %ld\n",
> + if (IS_ERR(cpud->cdev) && PTR_ERR(cpud->cdev) != -ENOSYS) {
> + pr_err("cpu%d is not running as cooling device: %ld\n",
> policy->cpu, PTR_ERR(cpud->cdev));
>
> cpud->cdev = NULL;
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 6+ messages in thread
* 答复: [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend
2016-04-18 10:32 ` [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Viresh Kumar
@ 2016-04-19 6:52 ` Hongtao Jia
0 siblings, 0 replies; 6+ messages in thread
From: Hongtao Jia @ 2016-04-19 6:52 UTC (permalink / raw)
To: Viresh Kumar
Cc: linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
Scott Wood, Yuantian Tang
DQoNCj4gLS0tLS3Tyrz+1K28/i0tLS0tDQo+ILeivP7IyzogVmlyZXNoIEt1bWFyIFttYWlsdG86
dmlyZXNoLmt1bWFyQGxpbmFyby5vcmddDQo+ILeiy83KsbzkOiBNb25kYXksIEFwcmlsIDE4LCAy
MDE2IDY6MzMgUE0NCj4gytW8/sjLOiBIb25ndGFvIEppYSA8aG9uZ3Rhby5qaWFAbnhwLmNvbT4N
Cj4gs63LzTogbGludXgtcG1Admdlci5rZXJuZWwub3JnOyBsaW51eHBwYy1kZXZAbGlzdHMub3ps
YWJzLm9yZzsgU2NvdHQgV29vZA0KPiA8c2NvdHQud29vZEBueHAuY29tPjsgWXVhbnRpYW4gVGFu
ZyA8eXVhbnRpYW4udGFuZ0BueHAuY29tPg0KPiDW98ziOiBSZTogW1BBVENIIDEvMl0gY3B1ZnJl
cTogcW9yaXE6IEZpeCBjb29saW5nIGRldmljZSByZWdpc3RyYXRpb24gaXNzdWUNCj4gZHVyaW5n
IHN1c3BlbmQNCj4gDQo+IE9uIDE4LTA0LTE2LCAxNTo1OSwgSmlhIEhvbmd0YW8gd3JvdGU6DQo+
ID4gQ29vbGluZyBkZXZpY2UgaXMgcmVnaXN0ZXJlZCBieSByZWFkeSBjYWxsYmFjay4gSXQncyBh
bHNvIGludm9rZWQNCj4gPiB3aGlsZSBzeXN0ZW0gcmVzdW1pbmcgZnJvbSBzbGVlcCAoRW5hYmxp
bmcgbm9uLWJvb3QgY3B1cykuIFRodXMNCj4gPiBjb29saW5nIGRldmljZSBtYXkgYmUgbXVsdGlw
bGUgcmVnaXN0ZXJlZC4gU3RvcF9jcHUgY2FsbGJhY2sgaXMNCj4gPiBpbnZva2VkIGR1cmluZyBz
dXNwZW5kIChEaXNhYmxpbmcgbm9uLWJvb3QgY3B1cykuIFNvIG1hdGNoYWJsZQ0KPiA+IHVucmVn
aXN0cmF0aW9uIGlzIGFkZGVkIHRvIGZpeCB0aGlzIGlzc3VlLg0KPiA+DQo+ID4gU2lnbmVkLW9m
Zi1ieTogSmlhIEhvbmd0YW8gPGhvbmd0YW8uamlhQG54cC5jb20+DQo+ID4gLS0tDQo+ID4gIGRy
aXZlcnMvY3B1ZnJlcS9xb3JpcS1jcHVmcmVxLmMgfCA4ICsrKysrKysrDQo+ID4gIDEgZmlsZSBj
aGFuZ2VkLCA4IGluc2VydGlvbnMoKykNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2Nw
dWZyZXEvcW9yaXEtY3B1ZnJlcS5jDQo+ID4gYi9kcml2ZXJzL2NwdWZyZXEvcW9yaXEtY3B1ZnJl
cS5jIGluZGV4IGIyM2U1MjUuLjFjMmZkYzEgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9jcHVm
cmVxL3FvcmlxLWNwdWZyZXEuYw0KPiA+ICsrKyBiL2RyaXZlcnMvY3B1ZnJlcS9xb3JpcS1jcHVm
cmVxLmMNCj4gPiBAQCAtMzA1LDYgKzMwNSw3IEBAIHN0YXRpYyBpbnQgX19leGl0IHFvcmlxX2Nw
dWZyZXFfY3B1X2V4aXQoc3RydWN0DQo+ID4gY3B1ZnJlcV9wb2xpY3kgKnBvbGljeSkgIHsNCj4g
PiAgCXN0cnVjdCBjcHVfZGF0YSAqZGF0YSA9IHBvbGljeS0+ZHJpdmVyX2RhdGE7DQo+ID4NCj4g
PiArCWNwdWZyZXFfY29vbGluZ191bnJlZ2lzdGVyKGRhdGEtPmNkZXYpOw0KPiA+ICAJa2ZyZWUo
ZGF0YS0+cGNsayk7DQo+ID4gIAlrZnJlZShkYXRhLT50YWJsZSk7DQo+ID4gIAlrZnJlZShkYXRh
KTsNCj4gPiBAQCAtMzIzLDYgKzMyNCwxMiBAQCBzdGF0aWMgaW50IHFvcmlxX2NwdWZyZXFfdGFy
Z2V0KHN0cnVjdCBjcHVmcmVxX3BvbGljeQ0KPiAqcG9saWN5LA0KPiA+ICAJcmV0dXJuIGNsa19z
ZXRfcGFyZW50KHBvbGljeS0+Y2xrLCBwYXJlbnQpOyAgfQ0KPiA+DQo+ID4gK3N0YXRpYyB2b2lk
IHFvcmlxX2NwdWZyZXFfc3RvcF9jcHUoc3RydWN0IGNwdWZyZXFfcG9saWN5ICpwb2xpY3kpIHsN
Cj4gPiArCXN0cnVjdCBjcHVfZGF0YSAqY3B1ZCA9IHBvbGljeS0+ZHJpdmVyX2RhdGE7DQo+ID4g
Kw0KPiA+ICsJY3B1ZnJlcV9jb29saW5nX3VucmVnaXN0ZXIoY3B1ZC0+Y2Rldik7DQo+ID4gK30N
Cj4gPg0KPiA+ICBzdGF0aWMgdm9pZCBxb3JpcV9jcHVmcmVxX3JlYWR5KHN0cnVjdCBjcHVmcmVx
X3BvbGljeSAqcG9saWN5KSAgeyBAQA0KPiA+IC0zNTIsNiArMzU5LDcgQEAgc3RhdGljIHN0cnVj
dCBjcHVmcmVxX2RyaXZlciBxb3JpcV9jcHVmcmVxX2RyaXZlciA9IHsNCj4gPiAgCS52ZXJpZnkJ
CT0gY3B1ZnJlcV9nZW5lcmljX2ZyZXF1ZW5jeV90YWJsZV92ZXJpZnksDQo+ID4gIAkudGFyZ2V0
X2luZGV4CT0gcW9yaXFfY3B1ZnJlcV90YXJnZXQsDQo+ID4gIAkuZ2V0CQk9IGNwdWZyZXFfZ2Vu
ZXJpY19nZXQsDQo+ID4gKwkuc3RvcF9jcHUJPSBxb3JpcV9jcHVmcmVxX3N0b3BfY3B1LA0KPiA+
ICAJLnJlYWR5CQk9IHFvcmlxX2NwdWZyZXFfcmVhZHksDQo+ID4gIAkuYXR0cgkJPSBjcHVmcmVx
X2dlbmVyaWNfYXR0ciwNCj4gPiAgfTsNCj4gDQo+IFlvdSBkb24ndCBuZWVkIHRvIGRvIGl0IGZy
b20gc3RvcF9jcHUoKSwgcGxlYXNlIHVzZQ0KPiBxb3JpcV9jcHVmcmVxX2NwdV9leGl0KCkgZm9y
IHRoaXMuDQoNClRoYW5rcy4gVGhlIG5ldyBwYXRjaCB3aWxsIGJlIHN1Ym1pdHRlZCBzb29uLg0K
DQotSG9uZ3Rhby4NCg0KPiANCj4gLS0NCj4gdmlyZXNoDQo=
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined
2016-04-18 10:33 ` Viresh Kumar
@ 2016-04-26 0:02 ` Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2016-04-26 0:02 UTC (permalink / raw)
To: Viresh Kumar, Jia Hongtao
Cc: linux-pm, linuxppc-dev, scott.wood, yuantian.tang
On Monday, April 18, 2016 04:03:45 PM Viresh Kumar wrote:
> On 18-04-16, 15:59, Jia Hongtao wrote:
> > When THERMAL_OF is undefined the cooling device messages should not be
> > shown. -ENOSYS is returned from of_cpufreq_cooling_register() when
> > THERMAL_OF is undefined.
> >
> > Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
> > ---
> > drivers/cpufreq/qoriq-cpufreq.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
> > index 1c2fdc1..ff8da83 100644
> > --- a/drivers/cpufreq/qoriq-cpufreq.c
> > +++ b/drivers/cpufreq/qoriq-cpufreq.c
> > @@ -340,8 +340,8 @@ static void qoriq_cpufreq_ready(struct cpufreq_policy *policy)
> > cpud->cdev = of_cpufreq_cooling_register(np,
> > policy->related_cpus);
> >
> > - if (IS_ERR(cpud->cdev)) {
> > - pr_err("Failed to register cooling device cpu%d: %ld\n",
> > + if (IS_ERR(cpud->cdev) && PTR_ERR(cpud->cdev) != -ENOSYS) {
> > + pr_err("cpu%d is not running as cooling device: %ld\n",
> > policy->cpu, PTR_ERR(cpud->cdev));
> >
> > cpud->cdev = NULL;
>
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Applied, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-26 0:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-18 7:59 [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Jia Hongtao
2016-04-18 7:59 ` [PATCH 2/2] cpufreq: qoriq: Don't show cooling device messages if THERMAL_OF undefined Jia Hongtao
2016-04-18 10:33 ` Viresh Kumar
2016-04-26 0:02 ` Rafael J. Wysocki
2016-04-18 10:32 ` [PATCH 1/2] cpufreq: qoriq: Fix cooling device registration issue during suspend Viresh Kumar
2016-04-19 6:52 ` 答复: " Hongtao Jia
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).