diff -rauN a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c	2022-05-02 21:01:51.302162225 +0200
+++ b/drivers/acpi/processor_idle.c	2022-05-02 21:04:58.169438104 +0200
@@ -796,6 +796,8 @@
 		    cx->type == ACPI_STATE_C3) {
 			state->enter_dead = acpi_idle_play_dead;
 			drv->safe_state_index = count;
+			if (cx->type != ACPI_STATE_C3)
+				drv->safe_state_index = count;
 		}
 		/*
 		 * Halt-induced C1 is not good for ->enter_s2idle, because it