On 04/11/2016 07:01 PM, Tony Lindgren wrote:
* Dave Gerlach <d-gerlach@xxxxxx> [160411 16:17]:
On 04/11/2016 04:13 PM, Tony Lindgren wrote:
We still need the call to omap3_intc_resume_idle because the intc restore
context only gets called on resume from off mode. Perhaps we only need to
call omap3_intc_resume_idle when coming back from non-off modes, otherwise
let the context restore handle the reconfig of the INTC idle/sysconfig
registers?
OK. Did you actually test by commenting out omap3_intc_resume_idle()?
Yeah sounds like we can optimize out the restore there for non-off
modes.
Yes I removed it entirely for testing, and I also tried something like this for
a possible workable solution (without your patch applied):
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index fcf975eb5e9d..8d39b44ba3a3 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -268,7 +268,6 @@ void omap_sram_idle(void)
int per_next_state = PWRDM_POWER_ON;
int core_next_state = PWRDM_POWER_ON;
int per_going_off;
- int core_prev_state;
u32 sdrc_pwr = 0;
mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm);
@@ -348,17 +347,16 @@ void omap_sram_idle(void)
sdrc_write_reg(sdrc_pwr, SDRC_POWER);
/* CORE */
- if (core_next_state < PWRDM_POWER_ON) {
- core_prev_state = pwrdm_read_prev_pwrst(core_pwrdm);
- if (core_prev_state == PWRDM_POWER_OFF) {
+ if (core_next_state < PWRDM_POWER_ON &&
+ pwrdm_read_prev_pwrst(core_pwrdm) == PWRDM_POWER_OFF) {
omap3_core_restore_context();
omap3_cm_restore_context();
omap3_push_sram_idle();
omap3_push_sram_secure_idle();
omap2_sms_restore_context();
- }
- }
- omap3_intc_resume_idle();
+ } else
+ omap3_intc_resume_idle();
+
pwrdm_post_transition(NULL);
OK yeah that works for me.
Can you post a proper patch with few minor changes:
- Add a comment to the code somewhere saying that for off mode,
omap3_core_restore_context() also restores intc and we don't
need to omap3_intc_resume_idle().
- Add the brackets to the one line else statement for checkpatch.
Thanks for your comments, I'm sure you've seen it but I sent a patch
here with the fixes you recommended here:
https://patchwork.kernel.org/patch/8811951/
Regards,
Dave
Cheers,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
