From: Jean Pihet <[email protected]> Trace the power domain transitions using the functional power states, which include the power and logic states.
Signed-off-by: Jean Pihet <[email protected]> [[email protected]: split the fix that was originally part of this patch into a separate patch] Signed-off-by: Paul Walmsley <[email protected]> --- arch/arm/mach-omap2/powerdomain.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 18f33de..2c732b6 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -881,13 +881,8 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst) pr_debug("powerdomain: %s: setting next powerstate to %0x\n", pwrdm->name, pwrst); - if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) { - /* Trace the pwrdm desired target state */ - trace_power_domain_target(pwrdm->name, pwrst, - smp_processor_id()); - /* Program the pwrdm desired target state */ + if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) ret = arch_pwrdm->pwrdm_set_next_pwrst(pwrdm, pwrst); - } return ret; } @@ -1571,6 +1566,9 @@ int pwrdm_set_next_fpwrst(struct powerdomain *pwrdm, u8 fpwrst) pr_debug("%s: set fpwrst %0x to pwrdm %s\n", __func__, fpwrst, pwrdm->name); + /* Trace the pwrdm desired target state */ + trace_power_domain_target(pwrdm->name, fpwrst, smp_processor_id()); + pwrdm_lock(pwrdm); ret = _set_logic_retst_and_pwrdm_pwrst(pwrdm, logic, pwrst); pwrdm_unlock(pwrdm); @@ -1658,6 +1656,10 @@ int pwrdm_set_fpwrst(struct powerdomain *pwrdm, enum pwrdm_func_state fpwrst) if (next_fpwrst == fpwrst) goto psf_out; + /* Trace the pwrdm desired target state */ + trace_power_domain_target(pwrdm->name, next_fpwrst, + smp_processor_id()); + sleep_switch = _pwrdm_save_clkdm_state_and_activate(pwrdm, pwrst, &hwsup); -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
