evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cpuidle: coupled: disable interrupts after entering safe state

Browse source 
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>
This commit is contained in:
Colin Cross 2013-08-23 12:45:10 -07:00 • committed by Rafael J. Wysocki
parent 51f245b895
commit 59e9985611
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/cpuidle/coupled.c
View file

@ -460,6 +460,7 @@ int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
} }
entered_state = cpuidle_enter_state(dev, drv, entered_state = cpuidle_enter_state(dev, drv,
dev->safe_state_index); dev->safe_state_index);
local_irq_disable();
} }
/* Read barrier ensures online_count is read after prevent is cleared */ /* Read barrier ensures online_count is read after prevent is cleared */
@ -485,6 +486,7 @@ retry:
entered_state = cpuidle_enter_state(dev, drv, entered_state = cpuidle_enter_state(dev, drv,
dev->safe_state_index); dev->safe_state_index);
local_irq_disable();
} }
if (cpuidle_coupled_clear_pokes(dev->cpu)) { if (cpuidle_coupled_clear_pokes(dev->cpu)) {