cpuidle: Rearrange s2idle-specific idle state entry code
Implement call_cpuidle_s2idle() in analogy with call_cpuidle() for the s2idle-specific idle state entry and invoke it from cpuidle_idle_call() to make the s2idle-specific idle entry code path look more similar to the "regular" idle entry one. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Chen Yu <yu.c.chen@intel.com>
This commit is contained in:
parent
81e6737518
commit
10e8b11eb3
2 changed files with 14 additions and 7 deletions
|
@ -13,7 +13,6 @@
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/sched/clock.h>
|
#include <linux/sched/clock.h>
|
||||||
#include <linux/sched/idle.h>
|
|
||||||
#include <linux/notifier.h>
|
#include <linux/notifier.h>
|
||||||
#include <linux/pm_qos.h>
|
#include <linux/pm_qos.h>
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
|
@ -187,9 +186,10 @@ int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev)
|
||||||
* be frozen safely.
|
* be frozen safely.
|
||||||
*/
|
*/
|
||||||
index = find_deepest_state(drv, dev, U64_MAX, 0, true);
|
index = find_deepest_state(drv, dev, U64_MAX, 0, true);
|
||||||
if (index > 0 && !current_clr_polling_and_test())
|
if (index > 0) {
|
||||||
enter_s2idle_proper(drv, dev, index);
|
enter_s2idle_proper(drv, dev, index);
|
||||||
|
local_irq_enable();
|
||||||
|
}
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SUSPEND */
|
#endif /* CONFIG_SUSPEND */
|
||||||
|
|
|
@ -96,6 +96,15 @@ void __cpuidle default_idle_call(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int call_cpuidle_s2idle(struct cpuidle_driver *drv,
|
||||||
|
struct cpuidle_device *dev)
|
||||||
|
{
|
||||||
|
if (current_clr_polling_and_test())
|
||||||
|
return -EBUSY;
|
||||||
|
|
||||||
|
return cpuidle_enter_s2idle(drv, dev);
|
||||||
|
}
|
||||||
|
|
||||||
static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
|
static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
|
||||||
int next_state)
|
int next_state)
|
||||||
{
|
{
|
||||||
|
@ -171,11 +180,9 @@ static void cpuidle_idle_call(void)
|
||||||
if (idle_should_enter_s2idle()) {
|
if (idle_should_enter_s2idle()) {
|
||||||
rcu_idle_enter();
|
rcu_idle_enter();
|
||||||
|
|
||||||
entered_state = cpuidle_enter_s2idle(drv, dev);
|
entered_state = call_cpuidle_s2idle(drv, dev);
|
||||||
if (entered_state > 0) {
|
if (entered_state > 0)
|
||||||
local_irq_enable();
|
|
||||||
goto exit_idle;
|
goto exit_idle;
|
||||||
}
|
|
||||||
|
|
||||||
rcu_idle_exit();
|
rcu_idle_exit();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue