@@ -75,6 +75,23 @@ static int cpuidle_idle_call(void)
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
int next_state, entered_state;
+ /*
+ * In poll mode we reenable interrupts and spin.
+ *
+ * Also if we detected in the wakeup from idle path that the
+ * tick broadcast device expired for us, we don't want to go
+ * deep idle as we know that the IPI is going to arrive right
+ * away
+ */
+ if (cpu_idle_force_poll || tick_check_broadcast_expired())
+ return cpu_idle_poll();
+
+ if (current_clr_polling_and_test()) {
+ local_irq_enable();
+ __current_set_polling();
+ return 0;
+ }
+
stop_critical_timings();
rcu_idle_enter();
@@ -112,6 +129,8 @@ out:
rcu_idle_exit();
start_critical_timings();
+ __current_set_polling();
+
return 0;
}
@@ -133,25 +152,8 @@ static void cpu_idle_loop(void)
local_irq_disable();
arch_cpu_idle_enter();
- /*
- * In poll mode we reenable interrupts and spin.
- *
- * Also if we detected in the wakeup from idle
- * path that the tick broadcast device expired
- * for us, we don't want to go deep idle as we
- * know that the IPI is going to arrive right
- * away
- */
- if (cpu_idle_force_poll || tick_check_broadcast_expired()) {
- cpu_idle_poll();
- } else {
- if (!current_clr_polling_and_test()) {
- cpuidle_idle_call();
- } else {
- local_irq_enable();
- }
- __current_set_polling();
- }
+ cpuidle_idle_call();
+
arch_cpu_idle_exit();
/*
* We need to test and propagate the TIF_NEED_RESCHED
This patch moves the condition before entering idle into the cpuidle main function located in idle.c. That simplify the idle mainloop functions and increase the readibility of the conditions to enter truly idle. This patch is code reorganization and does not change the behavior of the function. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- kernel/sched/idle.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)