diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-25 13:52:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-25 13:52:53 +0200 |
| commit | 10e8b11eb3195e11450c509d4dd3984d707a4167 (patch) | |
| tree | 03cd14b0f8d81868677bec9b96aef93622111687 /kernel | |
| parent | PM: s2idle: Clear _TIF_POLLING_NRFLAG before suspend to idle (diff) | |
| download | linux-10e8b11eb3195e11450c509d4dd3984d707a4167.tar.xz linux-10e8b11eb3195e11450c509d4dd3984d707a4167.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/idle.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 05deb81bb3e3..1ae95b9150d3 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -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, int next_state) { @@ -171,11 +180,9 @@ static void cpuidle_idle_call(void) if (idle_should_enter_s2idle()) { rcu_idle_enter(); - entered_state = cpuidle_enter_s2idle(drv, dev); - if (entered_state > 0) { - local_irq_enable(); + entered_state = call_cpuidle_s2idle(drv, dev); + if (entered_state > 0) goto exit_idle; - } rcu_idle_exit(); |