===================================================================
@@ -180,6 +180,8 @@ static inline int cpuidle_enable_device(
{return -ENODEV; }
static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
static inline int cpuidle_play_dead(void) {return -ENODEV; }
+static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
+ struct cpuidle_device *dev) {return NULL; }
#endif
#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
===================================================================
@@ -63,7 +63,6 @@ void __weak arch_cpu_idle(void)
local_irq_enable();
}
-#ifdef CONFIG_CPU_IDLE
/**
* cpuidle_idle_call - the main idle function
*
@@ -76,11 +75,21 @@ static int cpuidle_idle_call(void)
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
int next_state, entered_state;
+ stop_critical_timings();
+ rcu_idle_enter();
+
next_state = cpuidle_enabled(drv, dev);
- if (next_state < 0)
- return next_state;
+ if (next_state < 0) {
+ arch_cpu_idle();
+ goto out;
+ }
- /* ask the governor for the next state */
+ /*
+ * Ask the governor for the next state, this call can fail for
+ * different reasons: cpuidle is not enabled or an idle state
+ * fulfilling the constraints was not found. In this case, we
+ * fall back to the default idle function
+ */
next_state = cpuidle_select(drv, dev);
if (need_resched()) {
@@ -88,7 +97,7 @@ static int cpuidle_idle_call(void)
/* give the governor an opportunity to reflect on the outcome */
cpuidle_reflect(dev, next_state);
local_irq_enable();
- return 0;
+ goto out;
}
trace_cpu_idle_rcuidle(next_state, dev->cpu);
@@ -99,15 +108,15 @@ static int cpuidle_idle_call(void)
/* give the governor an opportunity to reflect on the outcome */
cpuidle_reflect(dev, entered_state);
+out:
+ if (WARN_ON_ONCE(irqs_disabled()))
+ local_irq_enable();
+
+ rcu_idle_exit();
+ start_critical_timings();
return 0;
}
-#else
-static inline int cpuidle_idle_call(void)
-{
- return -ENODEV;
-}
-#endif
/*
* Generic idle loop implementation
@@ -140,14 +149,7 @@ static void cpu_idle_loop(void)
cpu_idle_poll();
} else {
if (!current_clr_polling_and_test()) {
- stop_critical_timings();
- rcu_idle_enter();
- if (cpuidle_idle_call())
- arch_cpu_idle();
- if (WARN_ON_ONCE(irqs_disabled()))
- local_irq_enable();
- rcu_idle_exit();
- start_critical_timings();
+ cpuidle_idle_call();
} else {
local_irq_enable();
}