Commit 8aef33a7 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

cpuidle: remove the power_specified field in the driver 

We realized that the power usage field is never filled and when it
is filled for tegra, the power_specified flag is not set causing all
of these values to be reset when the driver is initialized with
set_power_state().

However, the power_specified flag can be simply removed under the
assumption that the states are always backward sorted, which is the
case with the current code.

This change allows the menu governor select function and the
cpuidle_play_dead() to be simplified.  Moreover, the
set_power_states() function can removed as it does not make sense
any more.

Drop the power_specified flag from struct cpuidle_driver and make
the related changes as described above.

As a consequence, this also fixes the bug where on the dynamic
C-states system, the power fields are not initialized.

[rjw: Changelog]
References: https://bugzilla.kernel.org/show_bug.cgi?id=42870
References: https://bugzilla.kernel.org/show_bug.cgi?id=43349
References: https://lkml.org/lkml/2012/10/16/518


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a412a11d

drivers/cpuidle/cpuidle.c

+4 −13
Original line number Diff line number Diff line
@@ -69,24 +69,15 @@ int cpuidle_play_dead(void) 
{

	struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);

	struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);

	int i, dead_state = -1;

	int power_usage = INT_MAX;

	int i;



	if (!drv)

		return -ENODEV;



	/* Find lowest-power state that supports long-term idle */

	for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) {

		struct cpuidle_state *s = &drv->states[i];



		if (s->power_usage < power_usage && s->enter_dead) {

			power_usage = s->power_usage;

			dead_state = i;

		}

	}



	if (dead_state != -1)

		return drv->states[dead_state].enter_dead(dev, dead_state);

	for (i = drv->state_count - 1; i >= CPUIDLE_DRIVER_STATE_START; i--)

		if (drv->states[i].enter_dead)

			return drv->states[i].enter_dead(dev, i);



	return -ENODEV;

}

drivers/cpuidle/driver.c

+0 −25
Original line number Diff line number Diff line
@@ -19,34 +19,9 @@ DEFINE_SPINLOCK(cpuidle_driver_lock); 
static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu);

static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu);



static void set_power_states(struct cpuidle_driver *drv)

{

	int i;



	/*

	 * cpuidle driver should set the drv->power_specified bit

	 * before registering if the driver provides

	 * power_usage numbers.

	 *

	 * If power_specified is not set,

	 * we fill in power_usage with decreasing values as the

	 * cpuidle code has an implicit assumption that state Cn

	 * uses less power than C(n-1).

	 *

	 * With CONFIG_ARCH_HAS_CPU_RELAX, C0 is already assigned

	 * an power value of -1.  So we use -2, -3, etc, for other

	 * c-states.

	 */

	for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++)

		drv->states[i].power_usage = -1 - i;

}



static void __cpuidle_driver_init(struct cpuidle_driver *drv)

{

	drv->refcnt = 0;



	if (!drv->power_specified)

		set_power_states(drv);

}



static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu)

drivers/cpuidle/governors/menu.c

+2 −6
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
{

	struct menu_device *data = &__get_cpu_var(menu_devices);

	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);

	int power_usage = INT_MAX;

	int i;

	int multiplier;

	struct timespec t;
@@ -383,12 +382,9 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
		if (s->exit_latency * multiplier > data->predicted_us)

			continue;



		if (s->power_usage < power_usage) {

			power_usage = s->power_usage;

		data->last_state_idx = i;

		data->exit_us = s->exit_latency;

	}

	}



	/* not deepest C-state chosen for low predicted residency */

	if (low_predicted) {

include/linux/cpuidle.h

+1 −1
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ struct cpuidle_driver { 
	struct module 		*owner;

	int                     refcnt;



	unsigned int		power_specified:1;

	/* set to 1 to use the core cpuidle time keeping (for all states). */

	unsigned int		en_core_tk_irqen:1;

	/* states array must be ordered in decreasing power consumption */

	struct cpuidle_state	states[CPUIDLE_STATE_MAX];

	int			state_count;

	int			safe_state_index;

CRA Git | Maintained and supported by SUSTech CRA and CCSE