Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI: processor: Do not expose global variable acpi_idle_driver 

Move the cpuidle driver check from __acpi_processor_start() to
acpi_processor_power_init() which allows variable acpi_idle_driver to
become static.

No intentional functional impact.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://patch.msgid.link/20250923032428.2656329-2-lihuisong@huawei.com
[ rjw: Subject tweak, new changelog, adjustment of a new comment ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Huisong Li 2025-09-23 11:24:28 +08:00 committed by Rafael J. Wysocki
parent fbd401e95e
commit 559f2eacc8
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/processor_driver.c
View File

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

9
drivers/acpi/processor_idle.c
View File

@ -51,7 +51,7 @@ module_param(latency_factor, uint, 0644);
static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device); static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);
struct cpuidle_driver acpi_idle_driver = { static struct cpuidle_driver acpi_idle_driver = {
.name = "acpi_idle", .name = "acpi_idle",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
@ -1404,6 +1404,13 @@ void acpi_processor_power_init(struct acpi_processor *pr)
{ {
struct cpuidle_device *dev; struct cpuidle_device *dev;
/*
* The code below only works if the current cpuidle driver is the ACPI
* idle driver.
*/
if (cpuidle_get_driver() != &acpi_idle_driver)
return;
if (disabled_by_idle_boot_param()) if (disabled_by_idle_boot_param())
return; return;

1
include/acpi/processor.h
View File

@ -417,7 +417,6 @@ static inline void acpi_processor_throttling_init(void) {}
#endif /* CONFIG_ACPI_CPU_FREQ_PSS */ #endif /* CONFIG_ACPI_CPU_FREQ_PSS */
/* in processor_idle.c */ /* in processor_idle.c */
extern struct cpuidle_driver acpi_idle_driver;
#ifdef CONFIG_ACPI_PROCESSOR_IDLE #ifdef CONFIG_ACPI_PROCESSOR_IDLE
void acpi_processor_power_init(struct acpi_processor *pr); void acpi_processor_power_init(struct acpi_processor *pr);
void acpi_processor_power_exit(struct acpi_processor *pr); void acpi_processor_power_exit(struct acpi_processor *pr);