| Message ID | 1460598588-28468-1-git-send-email-d-gerlach@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Dave Gerlach <d-gerlach@ti.com> [160413 18:51]: > Depending on timing during the resume path from off mode on 36xx, we may > see external aborts. These seem to be caused by the following: > > - OMAP3 Advisory 1.62 "MPU Cannot Exit from Standby" says we need to > disable disable intc autoidle before WFI > > - DM3730 Advisory 1.106 "MPU Leaves MSTANDBY State Before IDLEREQ of > Interrupt Controller is Released" says we need to wait before > accessing intc > > omap3_intc_resume_idle restores the intc autoidle for all resume paths, > however in the resume path from off mode only it is also being restored > by omap_intc_restore_context before this call to omap3_intc_resume_idle > happens. The second restore of the intc autoidle in this path is what > appears to be causing the external abort so for the off mode resume path > let's rely on omap_intc_restore_context to restore intc autoidle, and > for all other paths let omap3_intc_resume_idle handle it as it is now. > > Signed-off-by: Dave Gerlach <d-gerlach@ti.com> > --- > v1->v2: > - Rebased on v4.6-rc1 > - Tested with and without patch and no abort seen on v4.6-rc1 > - Series at [1] that v1 was based on alone on v4.6-rc1 sees abort, > if series is applied on this patch abort goes away Thanks for updating it, applying into omap-for-v4.6/fixes. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 2dbd3785ee6f..d44e0e2f1106 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -198,7 +198,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); @@ -278,16 +277,20 @@ 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) { - omap3_core_restore_context(); - omap3_cm_restore_context(); - omap3_sram_restore_context(); - omap2_sms_restore_context(); - } + 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_sram_restore_context(); + omap2_sms_restore_context(); + } else { + /* + * In off-mode resume path above, omap3_core_restore_context + * also handles the INTC autoidle restore done here so limit + * this to non-off mode resume paths so we don't do it twice. + */ + omap3_intc_resume_idle(); } - omap3_intc_resume_idle(); pwrdm_post_transition(NULL);
Depending on timing during the resume path from off mode on 36xx, we may see external aborts. These seem to be caused by the following: - OMAP3 Advisory 1.62 "MPU Cannot Exit from Standby" says we need to disable disable intc autoidle before WFI - DM3730 Advisory 1.106 "MPU Leaves MSTANDBY State Before IDLEREQ of Interrupt Controller is Released" says we need to wait before accessing intc omap3_intc_resume_idle restores the intc autoidle for all resume paths, however in the resume path from off mode only it is also being restored by omap_intc_restore_context before this call to omap3_intc_resume_idle happens. The second restore of the intc autoidle in this path is what appears to be causing the external abort so for the off mode resume path let's rely on omap_intc_restore_context to restore intc autoidle, and for all other paths let omap3_intc_resume_idle handle it as it is now. Signed-off-by: Dave Gerlach <d-gerlach@ti.com> --- v1->v2: - Rebased on v4.6-rc1 - Tested with and without patch and no abort seen on v4.6-rc1 - Series at [1] that v1 was based on alone on v4.6-rc1 sees abort, if series is applied on this patch abort goes away [1] https://github.com/dgerlach/linux-pm/tree/beagle-sram-wip-v4.6-rc1 arch/arm/mach-omap2/pm34xx.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)