* [PATCH V2] cpufreq: qoriq: Fix cooling device registration issue during suspend
@ 2016-04-19 6:43 Jia Hongtao
2016-04-19 7:54 ` Viresh Kumar
0 siblings, 1 reply; 3+ messages in thread
From: Jia Hongtao @ 2016-04-19 6:43 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. Matchable unregistration is added to exit
callback to fix this issue.
Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
---
Changes for V2:
* Using qoriq_cpufreq_cpu_exit() callback instead of adding stop_cpu().
drivers/cpufreq/qoriq-cpufreq.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index b23e525..0b85f90 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -301,10 +301,11 @@ err_np:
return -ENODEV;
}
-static int __exit qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
+static int 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);
@@ -348,7 +349,7 @@ static struct cpufreq_driver qoriq_cpufreq_driver = {
.name = "qoriq_cpufreq",
.flags = CPUFREQ_CONST_LOOPS,
.init = qoriq_cpufreq_cpu_init,
- .exit = __exit_p(qoriq_cpufreq_cpu_exit),
+ .exit = qoriq_cpufreq_cpu_exit,
.verify = cpufreq_generic_frequency_table_verify,
.target_index = qoriq_cpufreq_target,
.get = cpufreq_generic_get,
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] cpufreq: qoriq: Fix cooling device registration issue during suspend
2016-04-19 6:43 [PATCH V2] cpufreq: qoriq: Fix cooling device registration issue during suspend Jia Hongtao
@ 2016-04-19 7:54 ` Viresh Kumar
2016-04-19 8:51 ` 答复: " Hongtao Jia
0 siblings, 1 reply; 3+ messages in thread
From: Viresh Kumar @ 2016-04-19 7:54 UTC (permalink / raw)
To: Jia Hongtao; +Cc: linux-pm, linuxppc-dev, scott.wood, yuantian.tang
On 19-04-16, 14:43, 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. Matchable unregistration is added to exit
> callback to fix this issue.
>
> Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com>
> ---
> Changes for V2:
> * Using qoriq_cpufreq_cpu_exit() callback instead of adding stop_cpu().
>
> drivers/cpufreq/qoriq-cpufreq.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
> index b23e525..0b85f90 100644
> --- a/drivers/cpufreq/qoriq-cpufreq.c
> +++ b/drivers/cpufreq/qoriq-cpufreq.c
> @@ -301,10 +301,11 @@ err_np:
> return -ENODEV;
> }
>
> -static int __exit qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
> +static int qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
Yes, __exit should have been removed, but not in this patch to create confusion.
You should have submitted two separate patches for these changes.
> {
> struct cpu_data *data = policy->driver_data;
>
> + cpufreq_cooling_unregister(data->cdev);
> kfree(data->pclk);
> kfree(data->table);
> kfree(data);
> @@ -348,7 +349,7 @@ static struct cpufreq_driver qoriq_cpufreq_driver = {
> .name = "qoriq_cpufreq",
> .flags = CPUFREQ_CONST_LOOPS,
> .init = qoriq_cpufreq_cpu_init,
> - .exit = __exit_p(qoriq_cpufreq_cpu_exit),
> + .exit = qoriq_cpufreq_cpu_exit,
> .verify = cpufreq_generic_frequency_table_verify,
> .target_index = qoriq_cpufreq_target,
> .get = cpufreq_generic_get,
> --
> 2.1.0.27.g96db324
--
viresh
^ permalink raw reply [flat|nested] 3+ messages in thread
* 答复: [PATCH V2] cpufreq: qoriq: Fix cooling device registration issue during suspend
2016-04-19 7:54 ` Viresh Kumar
@ 2016-04-19 8:51 ` Hongtao Jia
0 siblings, 0 replies; 3+ messages in thread
From: Hongtao Jia @ 2016-04-19 8:51 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+ILeiy83KsbzkOiBUdWVzZGF5LCBBcHJpbCAxOSwg
MjAxNiAzOjU0IFBNDQo+IMrVvP7IyzogSG9uZ3RhbyBKaWEgPGhvbmd0YW8uamlhQG54cC5jb20+
DQo+ILOty806IGxpbnV4LXBtQHZnZXIua2VybmVsLm9yZzsgbGludXhwcGMtZGV2QGxpc3RzLm96
bGFicy5vcmc7IFNjb3R0IFdvb2QNCj4gPHNjb3R0Lndvb2RAbnhwLmNvbT47IFl1YW50aWFuIFRh
bmcgPHl1YW50aWFuLnRhbmdAbnhwLmNvbT4NCj4g1vfM4jogUmU6IFtQQVRDSCBWMl0gY3B1ZnJl
cTogcW9yaXE6IEZpeCBjb29saW5nIGRldmljZSByZWdpc3RyYXRpb24gaXNzdWUgZHVyaW5nDQo+
IHN1c3BlbmQNCj4gDQo+IE9uIDE5LTA0LTE2LCAxNDo0MywgSmlhIEhvbmd0YW8gd3JvdGU6DQo+
ID4gQ29vbGluZyBkZXZpY2UgaXMgcmVnaXN0ZXJlZCBieSByZWFkeSBjYWxsYmFjay4gSXQncyBh
bHNvIGludm9rZWQNCj4gPiB3aGlsZSBzeXN0ZW0gcmVzdW1pbmcgZnJvbSBzbGVlcCAoRW5hYmxp
bmcgbm9uLWJvb3QgY3B1cykuIFRodXMNCj4gPiBjb29saW5nIGRldmljZSBtYXkgYmUgbXVsdGlw
bGUgcmVnaXN0ZXJlZC4gTWF0Y2hhYmxlIHVucmVnaXN0cmF0aW9uIGlzDQo+ID4gYWRkZWQgdG8g
ZXhpdCBjYWxsYmFjayB0byBmaXggdGhpcyBpc3N1ZS4NCj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6
IEppYSBIb25ndGFvIDxob25ndGFvLmppYUBueHAuY29tPg0KPiA+IC0tLQ0KPiA+IENoYW5nZXMg
Zm9yIFYyOg0KPiA+ICogVXNpbmcgcW9yaXFfY3B1ZnJlcV9jcHVfZXhpdCgpIGNhbGxiYWNrIGlu
c3RlYWQgb2YgYWRkaW5nIHN0b3BfY3B1KCkuDQo+ID4NCj4gPiAgZHJpdmVycy9jcHVmcmVxL3Fv
cmlxLWNwdWZyZXEuYyB8IDUgKysrLS0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9u
cygrKSwgMiBkZWxldGlvbnMoLSkNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2NwdWZy
ZXEvcW9yaXEtY3B1ZnJlcS5jDQo+ID4gYi9kcml2ZXJzL2NwdWZyZXEvcW9yaXEtY3B1ZnJlcS5j
IGluZGV4IGIyM2U1MjUuLjBiODVmOTAgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9jcHVmcmVx
L3FvcmlxLWNwdWZyZXEuYw0KPiA+ICsrKyBiL2RyaXZlcnMvY3B1ZnJlcS9xb3JpcS1jcHVmcmVx
LmMNCj4gPiBAQCAtMzAxLDEwICszMDEsMTEgQEAgZXJyX25wOg0KPiA+ICAJcmV0dXJuIC1FTk9E
RVY7DQo+ID4gIH0NCj4gPg0KPiA+IC1zdGF0aWMgaW50IF9fZXhpdCBxb3JpcV9jcHVmcmVxX2Nw
dV9leGl0KHN0cnVjdCBjcHVmcmVxX3BvbGljeQ0KPiA+ICpwb2xpY3kpDQo+ID4gK3N0YXRpYyBp
bnQgcW9yaXFfY3B1ZnJlcV9jcHVfZXhpdChzdHJ1Y3QgY3B1ZnJlcV9wb2xpY3kgKnBvbGljeSkN
Cj4gDQo+IFllcywgX19leGl0IHNob3VsZCBoYXZlIGJlZW4gcmVtb3ZlZCwgYnV0IG5vdCBpbiB0
aGlzIHBhdGNoIHRvIGNyZWF0ZQ0KPiBjb25mdXNpb24uDQo+IFlvdSBzaG91bGQgaGF2ZSBzdWJt
aXR0ZWQgdHdvIHNlcGFyYXRlIHBhdGNoZXMgZm9yIHRoZXNlIGNoYW5nZXMuDQoNClRoYW5rcy4g
SSB3aWxsIHNlbmQgYSBuZXcgcGF0Y2ggc2V0IHNvb24uDQoNCj4gDQo+ID4gIHsNCj4gPiAgCXN0
cnVjdCBjcHVfZGF0YSAqZGF0YSA9IHBvbGljeS0+ZHJpdmVyX2RhdGE7DQo+ID4NCj4gPiArCWNw
dWZyZXFfY29vbGluZ191bnJlZ2lzdGVyKGRhdGEtPmNkZXYpOw0KPiA+ICAJa2ZyZWUoZGF0YS0+
cGNsayk7DQo+ID4gIAlrZnJlZShkYXRhLT50YWJsZSk7DQo+ID4gIAlrZnJlZShkYXRhKTsNCj4g
PiBAQCAtMzQ4LDcgKzM0OSw3IEBAIHN0YXRpYyBzdHJ1Y3QgY3B1ZnJlcV9kcml2ZXIgcW9yaXFf
Y3B1ZnJlcV9kcml2ZXIgPSB7DQo+ID4gIAkubmFtZQkJPSAicW9yaXFfY3B1ZnJlcSIsDQo+ID4g
IAkuZmxhZ3MJCT0gQ1BVRlJFUV9DT05TVF9MT09QUywNCj4gPiAgCS5pbml0CQk9IHFvcmlxX2Nw
dWZyZXFfY3B1X2luaXQsDQo+ID4gLQkuZXhpdAkJPSBfX2V4aXRfcChxb3JpcV9jcHVmcmVxX2Nw
dV9leGl0KSwNCj4gPiArCS5leGl0CQk9IHFvcmlxX2NwdWZyZXFfY3B1X2V4aXQsDQo+ID4gIAku
dmVyaWZ5CQk9IGNwdWZyZXFfZ2VuZXJpY19mcmVxdWVuY3lfdGFibGVfdmVyaWZ5LA0KPiA+ICAJ
LnRhcmdldF9pbmRleAk9IHFvcmlxX2NwdWZyZXFfdGFyZ2V0LA0KPiA+ICAJLmdldAkJPSBjcHVm
cmVxX2dlbmVyaWNfZ2V0LA0KPiA+IC0tDQo+ID4gMi4xLjAuMjcuZzk2ZGIzMjQNCj4gDQo+IC0t
DQo+IHZpcmVzaA0K
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-19 9:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-19 6:43 [PATCH V2] cpufreq: qoriq: Fix cooling device registration issue during suspend Jia Hongtao
2016-04-19 7:54 ` Viresh Kumar
2016-04-19 8:51 ` 答复: " 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).