Skip to content

Commit 8f04aea

Browse files
committed
ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails
If cpu_cluster_pm_enter() fails, we need to set MPU power domain back to enabled to prevent the next WFI from potentially triggering an undesired MPU power domain state change. We already do this for omap_enter_idle_smp() but are missing it for omap_enter_idle_coupled(). Fixes: 55be2f5 ("ARM: OMAP2+: Handle errors for cpu_pm") Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent b753e41 commit 8f04aea

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

arch/arm/mach-omap2/cpuidle44xx.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,10 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
174174
*/
175175
if (mpuss_can_lose_context) {
176176
error = cpu_cluster_pm_enter();
177-
if (error)
177+
if (error) {
178+
omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
178179
goto cpu_cluster_pm_out;
180+
}
179181
}
180182
}
181183

0 commit comments

Comments
 (0)