From: Preeti U Murthy <hidden> Date: 2015-02-03 06:20:28
The device tree now exposes the residency values for different idle states. Read
these values instead of calculating residency from the latency values. The values
exposed in the DT are validated for optimal power efficiency. However to maintain
compatibility with the older firmware code which does not expose residency
values, use default values as a fallback mechanism. While at it, use better
APIs to parse the powermgmt device tree node.
Signed-off-by: Preeti U Murthy <redacted>
Acked-by: Stewart Smith <redacted>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
---
Changes from the previous versions: https://lkml.org/lkml/2015/2/2/12
1. Used better APIs
2. Code Cleanups
3. Reverted back to the V2 of this patch as suggested in the above link,
in addition to a few cleanups and carried forward the Acks from V2
drivers/cpuidle/cpuidle-powernv.c | 71 ++++++++++++++++++++++---------------
1 file changed, 42 insertions(+), 29 deletions(-)
@@ -161,69 +162,81 @@ static int powernv_add_idle_states(void)intnr_idle_states=1;/* Snooze */intdt_idle_states;const__be32*idle_state_flags;-const__be32*idle_state_latency;-u32len_flags,flags,latency_ns;-inti;+u32len_flags,flags;+u32*latency_ns,*residency_ns;+inti,rc;/* Currently we have snooze statically defined */power_mgt=of_find_node_by_path("/ibm,opal/power-mgt");if(!power_mgt){pr_warn("opal: PowerMgmt Node not found\n");-returnnr_idle_states;+gotoout;}-idle_state_flags=of_get_property(power_mgt,"ibm,cpu-idle-state-flags",&len_flags);+idle_state_flags=of_get_property(power_mgt,+"ibm,cpu-idle-state-flags",&len_flags);if(!idle_state_flags){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-flags\n");-returnnr_idle_states;+pr_warn("cpuidle-powernv : missing+ibm,cpu-idle-state-flagsinDT\n");+gotoout;}-idle_state_latency=of_get_property(power_mgt,-"ibm,cpu-idle-state-latencies-ns",NULL);-if(!idle_state_latency){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-latencies-ns\n");-returnnr_idle_states;+dt_idle_states=len_flags/sizeof(u32);++latency_ns=kzalloc(sizeof(*latency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-latencies-ns",latency_ns,dt_idle_states);+if(rc){+pr_warn("cpuidle-powernv: missing+ibm,cpu-idle-state-latencies-nsinDT\n");+gotoout_free_latency;}-dt_idle_states=len_flags/sizeof(u32);+residency_ns=kzalloc(sizeof(*residency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-residency-ns",residency_ns,dt_idle_states);for(i=0;i<dt_idle_states;i++){flags=be32_to_cpu(idle_state_flags[i]);-/* Cpuidle accepts exit_latency in us and we estimate-*targetresidencytobe10xexit_latency+/*+*Cpuidleacceptsexit_latencyandtarget_residencyinus.+*Usedefaulttarget_residencyvaluesiff/wdoesnotexposeit.*/-latency_ns=be32_to_cpu(idle_state_latency[i]);if(flags&OPAL_PM_NAP_ENABLED){/* Add NAP state */strcpy(powernv_states[nr_idle_states].name,"Nap");strcpy(powernv_states[nr_idle_states].desc,"Nap");powernv_states[nr_idle_states].flags=0;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=100;powernv_states[nr_idle_states].enter=&nap_loop;-nr_idle_states++;-}--if(flags&OPAL_PM_SLEEP_ENABLED||+}elseif(flags&OPAL_PM_SLEEP_ENABLED||flags&OPAL_PM_SLEEP_ENABLED_ER1){/* Add FASTSLEEP state */strcpy(powernv_states[nr_idle_states].name,"FastSleep");strcpy(powernv_states[nr_idle_states].desc,"FastSleep");powernv_states[nr_idle_states].flags=CPUIDLE_FLAG_TIMER_STOP;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=300000;powernv_states[nr_idle_states].enter=&fastsleep_loop;-nr_idle_states++;}++powernv_states[nr_idle_states].exit_latency=+((unsignedint)latency_ns[i])/1000;++if(!rc){+powernv_states[nr_idle_states].target_residency=+((unsignedint)residency_ns[i])/1000;+}++nr_idle_states++;}+kfree(residency_ns);+out_free_latency:+kfree(latency_ns);+out:returnnr_idle_states;}
From: Preeti U Murthy <hidden> Date: 2015-02-17 08:00:15
Hi Rafael,
Can you please pull this patch ?
Another patch based on top of this is waiting to be pulled:
[PATCH] driver/cpuidle-powernv: Avoid endianness conversions while parsing DT
Regards
Preeti U Murthy
On 02/03/2015 11:50 AM, Preeti U Murthy wrote:
quoted hunk
The device tree now exposes the residency values for different idle states. Read
these values instead of calculating residency from the latency values. The values
exposed in the DT are validated for optimal power efficiency. However to maintain
compatibility with the older firmware code which does not expose residency
values, use default values as a fallback mechanism. While at it, use better
APIs to parse the powermgmt device tree node.
Signed-off-by: Preeti U Murthy <redacted>
Acked-by: Stewart Smith <redacted>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
---
Changes from the previous versions: https://lkml.org/lkml/2015/2/2/12
1. Used better APIs
2. Code Cleanups
3. Reverted back to the V2 of this patch as suggested in the above link,
in addition to a few cleanups and carried forward the Acks from V2
drivers/cpuidle/cpuidle-powernv.c | 71 ++++++++++++++++++++++---------------
1 file changed, 42 insertions(+), 29 deletions(-)
@@ -161,69 +162,81 @@ static int powernv_add_idle_states(void)intnr_idle_states=1;/* Snooze */intdt_idle_states;const__be32*idle_state_flags;-const__be32*idle_state_latency;-u32len_flags,flags,latency_ns;-inti;+u32len_flags,flags;+u32*latency_ns,*residency_ns;+inti,rc;/* Currently we have snooze statically defined */power_mgt=of_find_node_by_path("/ibm,opal/power-mgt");if(!power_mgt){pr_warn("opal: PowerMgmt Node not found\n");-returnnr_idle_states;+gotoout;}-idle_state_flags=of_get_property(power_mgt,"ibm,cpu-idle-state-flags",&len_flags);+idle_state_flags=of_get_property(power_mgt,+"ibm,cpu-idle-state-flags",&len_flags);if(!idle_state_flags){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-flags\n");-returnnr_idle_states;+pr_warn("cpuidle-powernv : missing+ibm,cpu-idle-state-flagsinDT\n");+gotoout;}-idle_state_latency=of_get_property(power_mgt,-"ibm,cpu-idle-state-latencies-ns",NULL);-if(!idle_state_latency){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-latencies-ns\n");-returnnr_idle_states;+dt_idle_states=len_flags/sizeof(u32);++latency_ns=kzalloc(sizeof(*latency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-latencies-ns",latency_ns,dt_idle_states);+if(rc){+pr_warn("cpuidle-powernv: missing+ibm,cpu-idle-state-latencies-nsinDT\n");+gotoout_free_latency;}-dt_idle_states=len_flags/sizeof(u32);+residency_ns=kzalloc(sizeof(*residency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-residency-ns",residency_ns,dt_idle_states);for(i=0;i<dt_idle_states;i++){flags=be32_to_cpu(idle_state_flags[i]);-/* Cpuidle accepts exit_latency in us and we estimate-*targetresidencytobe10xexit_latency+/*+*Cpuidleacceptsexit_latencyandtarget_residencyinus.+*Usedefaulttarget_residencyvaluesiff/wdoesnotexposeit.*/-latency_ns=be32_to_cpu(idle_state_latency[i]);if(flags&OPAL_PM_NAP_ENABLED){/* Add NAP state */strcpy(powernv_states[nr_idle_states].name,"Nap");strcpy(powernv_states[nr_idle_states].desc,"Nap");powernv_states[nr_idle_states].flags=0;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=100;powernv_states[nr_idle_states].enter=&nap_loop;-nr_idle_states++;-}--if(flags&OPAL_PM_SLEEP_ENABLED||+}elseif(flags&OPAL_PM_SLEEP_ENABLED||flags&OPAL_PM_SLEEP_ENABLED_ER1){/* Add FASTSLEEP state */strcpy(powernv_states[nr_idle_states].name,"FastSleep");strcpy(powernv_states[nr_idle_states].desc,"FastSleep");powernv_states[nr_idle_states].flags=CPUIDLE_FLAG_TIMER_STOP;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=300000;powernv_states[nr_idle_states].enter=&fastsleep_loop;-nr_idle_states++;}++powernv_states[nr_idle_states].exit_latency=+((unsignedint)latency_ns[i])/1000;++if(!rc){+powernv_states[nr_idle_states].target_residency=+((unsignedint)residency_ns[i])/1000;+}++nr_idle_states++;}+kfree(residency_ns);+out_free_latency:+kfree(latency_ns);+out:returnnr_idle_states;}
From: Preeti U Murthy <hidden> Date: 2015-02-18 04:44:28
On 02/17/2015 11:23 PM, Rafael J. Wysocki wrote:
On Tuesday, February 17, 2015 01:29:10 PM Preeti U Murthy wrote:
quoted
Hi Rafael,
Hi,
quoted
Can you please pull this patch ?
Sorry, I wasn't sure whether or not the patch was for me to take and then
I've been traveling lately. Applied now.
Hi Rafael,
I saw that the kbuild bot reported build issues around pr_warn() in this patch.
I have fixed this and below is the corrected patch. Do let me know if I have
to send it out as a separate version/RESEND tag.
quoted
Another patch based on top of this is waiting to be pulled:
[PATCH] driver/cpuidle-powernv: Avoid endianness conversions while parsing DT
OK, have you posted it already?
Yes I have. https://lkml.org/lkml/2015/2/3/24. This patch is also waiting to
be pulled by you. There was some confusion around who should pull this, but
since it all the code is in the driver, we thought it would be best if you pulled it.
Thanks
--------------------------- PATCH -------------------------------------
[PATCH V4] cpuidle/powernv: Read target_residency value of idle states from DT if available
From: Preeti U Murthy <redacted>
The device tree now exposes the residency values for different idle states. Read
these values instead of calculating residency from the latency values. The values
exposed in the DT are validated for optimal power efficiency. However to maintain
compatibility with the older firmware code which does not expose residency
values, use default values as a fallback mechanism. While at it, use better
APIs to parse the powermgmt device tree node.
Signed-off-by: Preeti U Murthy <redacted>
Acked-by: Stewart Smith <redacted>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
---
drivers/cpuidle/cpuidle-powernv.c | 69 +++++++++++++++++++++----------------
1 file changed, 40 insertions(+), 29 deletions(-)
@@ -159,69 +160,79 @@ static int powernv_add_idle_states(void)intnr_idle_states=1;/* Snooze */intdt_idle_states;const__be32*idle_state_flags;-const__be32*idle_state_latency;-u32len_flags,flags,latency_ns;-inti;+u32len_flags,flags;+u32*latency_ns,*residency_ns;+inti,rc;/* Currently we have snooze statically defined */power_mgt=of_find_node_by_path("/ibm,opal/power-mgt");if(!power_mgt){pr_warn("opal: PowerMgmt Node not found\n");-returnnr_idle_states;+gotoout;}-idle_state_flags=of_get_property(power_mgt,"ibm,cpu-idle-state-flags",&len_flags);+idle_state_flags=of_get_property(power_mgt,+"ibm,cpu-idle-state-flags",&len_flags);if(!idle_state_flags){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-flags\n");-returnnr_idle_states;+pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-flags in DT\n");+gotoout;}-idle_state_latency=of_get_property(power_mgt,-"ibm,cpu-idle-state-latencies-ns",NULL);-if(!idle_state_latency){-pr_warn("DT-PowerMgmt: missing ibm,cpu-idle-state-latencies-ns\n");-returnnr_idle_states;+dt_idle_states=len_flags/sizeof(u32);++latency_ns=kzalloc(sizeof(*latency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-latencies-ns",latency_ns,dt_idle_states);+if(rc){+pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-latencies-ns in DT\n");+gotoout_free_latency;}-dt_idle_states=len_flags/sizeof(u32);+residency_ns=kzalloc(sizeof(*residency_ns)*dt_idle_states,GFP_KERNEL);+rc=of_property_read_u32_array(power_mgt,+"ibm,cpu-idle-state-residency-ns",residency_ns,dt_idle_states);for(i=0;i<dt_idle_states;i++){flags=be32_to_cpu(idle_state_flags[i]);-/* Cpuidle accepts exit_latency in us and we estimate-*targetresidencytobe10xexit_latency+/*+*Cpuidleacceptsexit_latencyandtarget_residencyinus.+*Usedefaulttarget_residencyvaluesiff/wdoesnotexposeit.*/-latency_ns=be32_to_cpu(idle_state_latency[i]);if(flags&OPAL_PM_NAP_ENABLED){/* Add NAP state */strcpy(powernv_states[nr_idle_states].name,"Nap");strcpy(powernv_states[nr_idle_states].desc,"Nap");powernv_states[nr_idle_states].flags=0;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=100;powernv_states[nr_idle_states].enter=&nap_loop;-nr_idle_states++;-}--if(flags&OPAL_PM_SLEEP_ENABLED||+}elseif(flags&OPAL_PM_SLEEP_ENABLED||flags&OPAL_PM_SLEEP_ENABLED_ER1){/* Add FASTSLEEP state */strcpy(powernv_states[nr_idle_states].name,"FastSleep");strcpy(powernv_states[nr_idle_states].desc,"FastSleep");powernv_states[nr_idle_states].flags=CPUIDLE_FLAG_TIMER_STOP;-powernv_states[nr_idle_states].exit_latency=-((unsignedint)latency_ns)/1000;-powernv_states[nr_idle_states].target_residency=-((unsignedint)latency_ns/100);+powernv_states[nr_idle_states].target_residency=300000;powernv_states[nr_idle_states].enter=&fastsleep_loop;-nr_idle_states++;}++powernv_states[nr_idle_states].exit_latency=+((unsignedint)latency_ns[i])/1000;++if(!rc){+powernv_states[nr_idle_states].target_residency=+((unsignedint)residency_ns[i])/1000;+}++nr_idle_states++;}+kfree(residency_ns);+out_free_latency:+kfree(latency_ns);+out:returnnr_idle_states;}
From: Rafael J. Wysocki <hidden> Date: 2015-02-18 05:28:01
On Wednesday, February 18, 2015 10:13:23 AM Preeti U Murthy wrote:
On 02/17/2015 11:23 PM, Rafael J. Wysocki wrote:
quoted
On Tuesday, February 17, 2015 01:29:10 PM Preeti U Murthy wrote:
quoted
Hi Rafael,
Hi,
quoted
Can you please pull this patch ?
Sorry, I wasn't sure whether or not the patch was for me to take and then
I've been traveling lately. Applied now.
Hi Rafael,
I saw that the kbuild bot reported build issues around pr_warn() in this patch.
I have fixed this and below is the corrected patch. Do let me know if I have
to send it out as a separate version/RESEND tag.
I've applied it, thanks!
quoted
quoted
Another patch based on top of this is waiting to be pulled:
[PATCH] driver/cpuidle-powernv: Avoid endianness conversions while parsing DT
OK, so this one does not apply for me on top of the other. Can you rebase it
on top of my current linux-next branch and resend it, please?
Also I'd appreciate it if someone could ACK DT-related stuff for me.
This patch is also waiting to be pulled by you. There was some confusion
around who should pull this, but since it all the code is in the driver, we
thought it would be best if you pulled it.
Well, OK. If you want me to apply a patch, send it To: me and not To: someone
else. If you send it To: someone else, I'll ignore it.
Also ask people to review and ACK things you want me to pull, especially if
that's not stuff I'm particularly familiar with (like related to DT bindings
specific to your platform etc.).
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
From: Preeti U Murthy <hidden> Date: 2015-02-18 06:20:11
On 02/18/2015 11:21 AM, Rafael J. Wysocki wrote:
On Wednesday, February 18, 2015 10:13:23 AM Preeti U Murthy wrote:
quoted
On 02/17/2015 11:23 PM, Rafael J. Wysocki wrote:
quoted
On Tuesday, February 17, 2015 01:29:10 PM Preeti U Murthy wrote:
quoted
Hi Rafael,
Hi,
quoted
Can you please pull this patch ?
Sorry, I wasn't sure whether or not the patch was for me to take and then
I've been traveling lately. Applied now.
Hi Rafael,
I saw that the kbuild bot reported build issues around pr_warn() in this patch.
I have fixed this and below is the corrected patch. Do let me know if I have
to send it out as a separate version/RESEND tag.
I've applied it, thanks!
quoted
quoted
quoted
Another patch based on top of this is waiting to be pulled:
[PATCH] driver/cpuidle-powernv: Avoid endianness conversions while parsing DT
OK, so this one does not apply for me on top of the other. Can you rebase it
on top of my current linux-next branch and resend it, please?
Also I'd appreciate it if someone could ACK DT-related stuff for me.
Yes Ill get this done.
quoted
This patch is also waiting to be pulled by you. There was some confusion
around who should pull this, but since it all the code is in the driver, we
thought it would be best if you pulled it.
Well, OK. If you want me to apply a patch, send it To: me and not To: someone
else. If you send it To: someone else, I'll ignore it.
Also ask people to review and ACK things you want me to pull, especially if
that's not stuff I'm particularly familiar with (like related to DT bindings
specific to your platform etc.).