cpuidle: menu: Remove single state handling

cloehle · rafaeljw · commit 93983a9f3bee · 2026-02-17T15:49:53.000+01:00
cpuidle systems where the governor has no choice because there's only a single idle state are now handled by cpuidle core and bypass the governor, so remove the related handling. Signed-off-by: Christian Loehle <christian.loehle@arm.com> [ rjw: Rebase on top of the cpuidle changes merged recently ] Link: https://patch.msgid.link/20260216185005.1131593-5-aboorvad@linux.ibm.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
@@ -281,7 +281,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
 		data->bucket = BUCKETS - 1;
 	}
 
-	if (drv->state_count <= 1 || latency_req == 0 ||
+	if (latency_req == 0 ||
 	    ((data->next_timer_ns < drv->states[1].target_residency_ns ||
 	      latency_req < drv->states[1].exit_latency_ns) &&
 	     !dev->states_usage[0].disable)) {

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ static int menu_select(struct cpuidle_driver drv, struct cpuidle_device dev,`
`281`	`281`	`data->bucket = BUCKETS - 1;`
`282`	`282`	`}`
`283`	`283`
`284`		`- if (drv->state_count <= 1 \|\| latency_req == 0 \|\|`
	`284`	`+ if (latency_req == 0 \|\|`
`285`	`285`	`((data->next_timer_ns < drv->states[1].target_residency_ns \|\|`
`286`	`286`	`latency_req < drv->states[1].exit_latency_ns) &&`
`287`	`287`	`!dev->states_usage[0].disable)) {`