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

Commit 1b39e3f8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpuidle: Make drivers initialize polling state 



Make the drivers that want to include the polling state into their
states table initialize it explicitly and drop the initialization of
it (which in fact is conditional, but that is not obvious from the
code) from the core.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 34c2f65b

drivers/acpi/processor_idle.c

+8 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr, 


static int acpi_processor_setup_cstates(struct acpi_processor *pr)

{

	int i, count = ACPI_IDLE_STATE_START;

	int i, count;

	struct acpi_processor_cx *cx;

	struct cpuidle_state *state;

	struct cpuidle_driver *drv = &acpi_idle_driver;
@@ -850,6 +850,13 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr) 
	if (max_cstate == 0)

		max_cstate = 1;



	if (IS_ENABLED(CONFIG_ARCH_HAS_CPU_RELAX)) {

		cpuidle_poll_state_init(drv);

		count = 1;

	} else {

		count = 0;

	}



	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {

		cx = &pr->power.states[i];

drivers/cpuidle/driver.c

+0 −2
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ static int __cpuidle_register_driver(struct cpuidle_driver *drv) 
		on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer,

				 (void *)1, 1);



	poll_idle_init(drv);



	return 0;

}

drivers/cpuidle/poll_state.c

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, 
	return index;

}



void poll_idle_init(struct cpuidle_driver *drv)

void cpuidle_poll_state_init(struct cpuidle_driver *drv)

{

	struct cpuidle_state *state = &drv->states[0];
@@ -34,3 +34,4 @@ void poll_idle_init(struct cpuidle_driver *drv) 
	state->disabled = false;

	state->flags = CPUIDLE_FLAG_POLLING;

}

EXPORT_SYMBOL_GPL(cpuidle_poll_state_init);

drivers/idle/intel_idle.c

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,7 @@ static void __init intel_idle_cpuidle_driver_init(void) 


	intel_idle_state_table_update();



	cpuidle_poll_state_init(drv);

	drv->state_count = 1;



	for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {

include/linux/cpuidle.h

+2 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, 
#endif



#ifdef CONFIG_ARCH_HAS_CPU_RELAX

void poll_idle_init(struct cpuidle_driver *drv);

void cpuidle_poll_state_init(struct cpuidle_driver *drv);

#else

static void poll_idle_init(struct cpuidle_driver *drv) {}

static inline void cpuidle_poll_state_init(struct cpuidle_driver *drv) {}

#endif



/******************************