Commit 10e8b11e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarChen Yu <yu.c.chen@intel.com>
parent 81e67375

drivers/cpuidle/cpuidle.c

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/mutex.h>

#include <linux/sched.h>

#include <linux/sched/clock.h>

#include <linux/sched/idle.h>

#include <linux/notifier.h>

#include <linux/pm_qos.h>

#include <linux/cpu.h>
@@ -187,9 +186,10 @@ int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
	 * be frozen safely.

	 */

	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);



		local_irq_enable();

	}

	return index;

}

#endif /* CONFIG_SUSPEND */

kernel/sched/idle.c

+11 −4
Original line number Diff line number Diff line
@@ -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();

CRA Git | Maintained and supported by SUSTech CRA and CCSE