diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-09-23 09:16:22 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 10:12:04 +0100 |
| commit | e7663717b62557d11c5659e40c1d19870e24dc70 (patch) | |
| tree | b71d86c0816f75ab4e3e7632d6e9df7771edcadf /arch | |
| parent | e6406d99e20b35c17a35cb9bb894593c40459199 (diff) | |
| download | linux-stable-e7663717b62557d11c5659e40c1d19870e24dc70.tar.gz linux-stable-e7663717b62557d11c5659e40c1d19870e24dc70.tar.bz2 linux-stable-e7663717b62557d11c5659e40c1d19870e24dc70.zip | |
ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails
[ Upstream commit 8f04aea048d56f3e39a7e543939450246542a6fc ]
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: 55be2f50336f ("ARM: OMAP2+: Handle errors for cpu_pm")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle44xx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index 6f5f89711f25..a92d277f81a0 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -174,8 +174,10 @@ 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; + } } } |