diff options
author | Colin Cross <ccross@android.com> | 2013-08-23 15:45:10 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-29 16:11:38 -0400 |
commit | 59e998561103a93f294c8d3138dd659af772a5da (patch) | |
tree | ef7bc435dbe2346af94992c06543b91d5e49164a /drivers/cpuidle/coupled.c | |
parent | 51f245b895e3fe4cbac0b2633e54a1830864a83f (diff) |
cpuidle: coupled: disable interrupts after entering safe state
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.
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpuidle/coupled.c')
-rw-r--r-- | drivers/cpuidle/coupled.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c index 2a297f86dbad..db92bcbe6946 100644 --- a/drivers/cpuidle/coupled.c +++ b/drivers/cpuidle/coupled.c | |||
@@ -460,6 +460,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev, | |||
460 | } | 460 | } |
461 | entered_state = cpuidle_enter_state(dev, drv, | 461 | entered_state = cpuidle_enter_state(dev, drv, |
462 | dev->safe_state_index); | 462 | dev->safe_state_index); |
463 | local_irq_disable(); | ||
463 | } | 464 | } |
464 | 465 | ||
465 | /* Read barrier ensures online_count is read after prevent is cleared */ | 466 | /* Read barrier ensures online_count is read after prevent is cleared */ |
@@ -485,6 +486,7 @@ retry: | |||
485 | 486 | ||
486 | entered_state = cpuidle_enter_state(dev, drv, | 487 | entered_state = cpuidle_enter_state(dev, drv, |
487 | dev->safe_state_index); | 488 | dev->safe_state_index); |
489 | local_irq_disable(); | ||
488 | } | 490 | } |
489 | 491 | ||
490 | if (cpuidle_coupled_clear_pokes(dev->cpu)) { | 492 | if (cpuidle_coupled_clear_pokes(dev->cpu)) { |