lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 617/757] ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails
    Date
    From: Tony Lindgren <tony@atomide.com>

    [ 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>
    ---
    arch/arm/mach-omap2/cpuidle44xx.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
    index 6f5f89711f256..a92d277f81a08 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;
    + }
    }
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:35    [W:2.634 / U:1.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site