]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI: processor: idle: Reset power_setup_done flag on initialization failure
authorHuisong Li <lihuisong@huawei.com>
Fri, 3 Apr 2026 08:53:43 +0000 (16:53 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 4 Apr 2026 18:41:01 +0000 (20:41 +0200)
The 'power_setup_done' flag is a key indicator used across the ACPI
processor driver to determine if cpuidle are properly configured and
available for a given CPU.

Currently, this flag is set during the early stages of initialization.
However, if the subsequent registration of the cpuidle driver in
acpi_processor_register_idle_driver() or the per-CPU device registration
in acpi_processor_power_init() fails, this flag remains set. This may
lead to some issues where other functions in ACPI idle driver use these
flags.

Fix this by explicitly resetting this flag to 0 in these error paths.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://patch.msgid.link/20260403085343.866440-1-lihuisong@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/processor_idle.c

index 479995a4c48ab64fbbf130fe9c5bfe8fbfe7df57..6172462c7b4ef65e50d4cebf2779f78f039335be 100644 (file)
@@ -1379,6 +1379,7 @@ void acpi_processor_register_idle_driver(void)
 
        ret = cpuidle_register_driver(&acpi_idle_driver);
        if (ret) {
+               pr->flags.power_setup_done = 0;
                pr_debug("register %s failed.\n", acpi_idle_driver.name);
                return;
        }
@@ -1387,7 +1388,16 @@ void acpi_processor_register_idle_driver(void)
 
 void acpi_processor_unregister_idle_driver(void)
 {
+       struct acpi_processor *pr;
+       int cpu;
+
        cpuidle_unregister_driver(&acpi_idle_driver);
+       for_each_possible_cpu(cpu) {
+               pr = per_cpu(processors, cpu);
+               if (!pr)
+                       continue;
+               pr->flags.power_setup_done = 0;
+       }
 }
 
 void acpi_processor_power_init(struct acpi_processor *pr)
@@ -1424,6 +1434,7 @@ void acpi_processor_power_init(struct acpi_processor *pr)
         */
        if (cpuidle_register_device(dev)) {
                per_cpu(acpi_cpuidle_device, pr->id) = NULL;
+               pr->flags.power_setup_done = 0;
                kfree(dev);
        }
 }