leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: OMAP2+: powerdomain: fix powerdomain trace integration

Browse Source 
Fix the trace in the case a power domain did not hit the desired
state, as reported by Paul Walmsley.

Reported-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Jean Pihet <j-pihet@ti.com>
[paul@pwsan.com: split this fix off from the patch
 "ARM: OMAP2+: PM debug: trace the functional power domains states"]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Jean Pihet 2013-01-26 00:58:13 -07:00 committed by Paul Walmsley
parent 32d174ed1b
commit c165a14023
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-omap2/powerdomain.c
View File

@ -143,7 +143,7 @@ static void _update_logic_membank_counters(struct powerdomain *pwrdm)
static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
{ {
int prev, state, trace_state = 0; int prev, next, state, trace_state = 0;
if (pwrdm == NULL) if (pwrdm == NULL)
return -EINVAL; return -EINVAL;
@ -164,9 +164,10 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
* If the power domain did not hit the desired state, * If the power domain did not hit the desired state,
* generate a trace event with both the desired and hit states * generate a trace event with both the desired and hit states
*/ */
if (state != prev) { next = pwrdm_read_next_pwrst(pwrdm);
if (next != prev) {
trace_state = (PWRDM_TRACE_STATES_FLAG | trace_state = (PWRDM_TRACE_STATES_FLAG |
((state & OMAP_POWERSTATE_MASK) << 8) | ((next & OMAP_POWERSTATE_MASK) << 8) |
((prev & OMAP_POWERSTATE_MASK) << 0)); ((prev & OMAP_POWERSTATE_MASK) << 0));
trace_power_domain_target(pwrdm->name, trace_state, trace_power_domain_target(pwrdm->name, trace_state,
smp_processor_id()); smp_processor_id());