]> www.infradead.org Git - users/hch/misc.git/commitdiff
ACPI: processor: Update cpuidle driver check in __acpi_processor_start()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Sep 2025 21:09:17 +0000 (23:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 19 Sep 2025 20:49:49 +0000 (22:49 +0200)
Commit 7a8c994cbb2d ("ACPI: processor: idle: Optimize ACPI idle
driver registration") moved the ACPI idle driver registration to
acpi_processor_driver_init() and acpi_processor_power_init() does
not register an idle driver any more.

Accordingly, the cpuidle driver check in __acpi_processor_start() needs
to be updated to avoid calling acpi_processor_power_init() without a
cpuidle driver, in which case the registration of the cpuidle device
in that function would lead to a NULL pointer dereference in
__cpuidle_register_device().

Fixes: 7a8c994cbb2d ("ACPI: processor: idle: Optimize ACPI idle driver registration")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Link: https://patch.msgid.link/5044465.31r3eYUQgx@rafael.j.wysocki
[ rjw: Changelog update ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/processor_driver.c

index bc9f58a02c1db536e4e24c2f23206c4e72530d70..de17c1412678091f55780653aacd05ad428d3649 100644 (file)
@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device)
        if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
                dev_dbg(&device->dev, "CPPC data invalid or not present\n");
 
-       if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+       if (cpuidle_get_driver() == &acpi_idle_driver)
                acpi_processor_power_init(pr);
 
        acpi_pss_perf_init(pr);