From mboxrd@z Thu Jan 1 00:00:00 1970 From: Colin Cross Subject: [PATCH 1/3] cpuidle: coupled: disable interrupts after entering safe state Date: Fri, 23 Aug 2013 12:45:10 -0700 Message-ID: <1377287112-12018-1-git-send-email-ccross@android.com> Return-path: Sender: stable-owner@vger.kernel.org To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Neil Zhang , Joseph Lo , linux-tegra@vger.kernel.org, Colin Cross , stable@vger.kernel.org, "Rafael J. Wysocki" , Daniel Lezcano List-Id: linux-pm@vger.kernel.org Calling cpuidle_enter_state is expected to return with interrupts enabled, but interrupts must be disabled before starting the ready loop synchronization stage. Call local_irq_disable after each call to cpuidle_enter_state for the safe state. CC: stable@vger.kernel.org Signed-off-by: Colin Cross --- drivers/cpuidle/coupled.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c index 2a297f8..db92bcb 100644 --- a/drivers/cpuidle/coupled.c +++ b/drivers/cpuidle/coupled.c @@ -460,6 +460,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev, } entered_state = cpuidle_enter_state(dev, drv, dev->safe_state_index); + local_irq_disable(); } /* Read barrier ensures online_count is read after prevent is cleared */ @@ -485,6 +486,7 @@ retry: entered_state = cpuidle_enter_state(dev, drv, dev->safe_state_index); + local_irq_disable(); } if (cpuidle_coupled_clear_pokes(dev->cpu)) { -- 1.8.3