Commit 8f04aea0 authored Sep 23, 2020 by Tony Lindgren

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: 55be2f50 ("ARM: OMAP2+: Handle errors for cpu_pm")
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent b753e41d

arch/arm/mach-omap2/cpuidle44xx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -174,10 +174,12 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
		*/
		if (mpuss_can_lose_context) {
		error = cpu_cluster_pm_enter();
		if (error)
		if (error) {
		omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
		goto cpu_cluster_pm_out;
		}
		}
		}

		omap4_enter_lowpower(dev->cpu, cx->cpu_state);
		cpu_done[dev->cpu] = true;

Admin message