Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ba086e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / s2idle: Rename ->enter_freeze to ->enter_s2idle 



Rename the ->enter_freeze cpuidle driver callback to ->enter_s2idle
to make it clear that it is used for entering suspend-to-idle and
rename the related functions, variables and so on accordingly.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f02f4f9d

arch/arm/mach-tegra/cpuidle-tegra114.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, 
	return index;

}



static void tegra114_idle_enter_freeze(struct cpuidle_device *dev,

static void tegra114_idle_enter_s2idle(struct cpuidle_device *dev,

				       struct cpuidle_driver *drv,

				       int index)

{
@@ -77,7 +77,7 @@ static struct cpuidle_driver tegra_idle_driver = { 
#ifdef CONFIG_PM_SLEEP

		[1] = {

			.enter			= tegra114_idle_power_down,

			.enter_freeze		= tegra114_idle_enter_freeze,

			.enter_s2idle		= tegra114_idle_enter_s2idle,

			.exit_latency		= 500,

			.target_residency	= 1000,

			.flags			= CPUIDLE_FLAG_TIMER_STOP,

drivers/acpi/processor_idle.c

+3 −3
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ static int acpi_idle_enter(struct cpuidle_device *dev, 
	return index;

}



static void acpi_idle_enter_freeze(struct cpuidle_device *dev,

static void acpi_idle_enter_s2idle(struct cpuidle_device *dev,

				   struct cpuidle_driver *drv, int index)

{

	struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu);
@@ -867,14 +867,14 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr) 
			drv->safe_state_index = count;

		}

		/*

		 * Halt-induced C1 is not good for ->enter_freeze, because it

		 * Halt-induced C1 is not good for ->enter_s2idle, because it

		 * re-enables interrupts on exit.  Moreover, C1 is generally not

		 * particularly interesting from the suspend-to-idle angle, so

		 * avoid C1 and the situations in which we may need to fall back

		 * to it altogether.

		 */

		if (cx->type != ACPI_STATE_C1 && !acpi_idle_fallback_to_c1(pr))

			state->enter_freeze = acpi_idle_enter_freeze;

			state->enter_s2idle = acpi_idle_enter_s2idle;



		count++;

		if (count == CPUIDLE_STATE_MAX)

drivers/cpuidle/cpuidle.c

+9 −9
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int find_deepest_state(struct cpuidle_driver *drv, 
			      struct cpuidle_device *dev,

			      unsigned int max_latency,

			      unsigned int forbidden_flags,

			      bool freeze)

			      bool s2idle)

{

	unsigned int latency_req = 0;

	int i, ret = 0;
@@ -89,7 +89,7 @@ static int find_deepest_state(struct cpuidle_driver *drv, 
		if (s->disabled || su->disable || s->exit_latency <= latency_req

		    || s->exit_latency > max_latency

		    || (s->flags & forbidden_flags)

		    || (freeze && !s->enter_freeze))

		    || (s2idle && !s->enter_s2idle))

			continue;



		latency_req = s->exit_latency;
@@ -128,7 +128,7 @@ int cpuidle_find_deepest_state(struct cpuidle_driver *drv, 
}



#ifdef CONFIG_SUSPEND

static void enter_freeze_proper(struct cpuidle_driver *drv,

static void enter_s2idle_proper(struct cpuidle_driver *drv,

				struct cpuidle_device *dev, int index)

{

	/*
@@ -143,7 +143,7 @@ static void enter_freeze_proper(struct cpuidle_driver *drv, 
	 * suspended is generally unsafe.

	 */

	stop_critical_timings();

	drv->states[index].enter_freeze(dev, drv, index);

	drv->states[index].enter_s2idle(dev, drv, index);

	WARN_ON(!irqs_disabled());

	/*

	 * timekeeping_resume() that will be called by tick_unfreeze() for the
@@ -155,25 +155,25 @@ static void enter_freeze_proper(struct cpuidle_driver *drv, 
}



/**

 * cpuidle_enter_freeze - Enter an idle state suitable for suspend-to-idle.

 * cpuidle_enter_s2idle - Enter an idle state suitable for suspend-to-idle.

 * @drv: cpuidle driver for the given CPU.

 * @dev: cpuidle device for the given CPU.

 *

 * If there are states with the ->enter_freeze callback, find the deepest of

 * If there are states with the ->enter_s2idle callback, find the deepest of

 * them and enter it with frozen tick.

 */

int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev)

int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev)

{

	int index;



	/*

	 * Find the deepest state with ->enter_freeze present, which guarantees

	 * Find the deepest state with ->enter_s2idle present, which guarantees

	 * that interrupts won't be enabled when it exits and allows the tick to

	 * be frozen safely.

	 */

	index = find_deepest_state(drv, dev, UINT_MAX, 0, true);

	if (index > 0)

		enter_freeze_proper(drv, dev, index);

		enter_s2idle_proper(drv, dev, index);



	return index;

}

drivers/cpuidle/dt_idle_states.c

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ static int init_state_node(struct cpuidle_state *idle_state, 
	/*

	 * Since this is not a "coupled" state, it's safe to assume interrupts

	 * won't be enabled when it exits allowing the tick to be frozen

	 * safely. So enter() can be also enter_freeze() callback.

	 * safely. So enter() can be also enter_s2idle() callback.

	 */

	idle_state->enter_freeze = match_id->data;

	idle_state->enter_s2idle = match_id->data;



	err = of_property_read_u32(state_node, "wakeup-latency-us",

				   &idle_state->exit_latency);

drivers/idle/intel_idle.c

+90 −90

File changed.

Preview size limit exceeded, changes collapsed.