diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-24 17:11:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-24 17:11:27 +0100 |
| commit | 6babf38d894bec696761c10fbfccafceae76f4eb (patch) | |
| tree | 918f897ae8c27934f5dbadd64f667b6592a88ef2 /drivers/acpi/processor_thermal.c | |
| parent | thermal: core: Restore behavior regarding invalid trip points (diff) | |
| parent | ACPI: processor: thermal: Update CPU cooling devices on cpufreq policy changes (diff) | |
| download | linux-6babf38d894bec696761c10fbfccafceae76f4eb.tar.xz linux-6babf38d894bec696761c10fbfccafceae76f4eb.zip | |
Merge branch 'thermal-acpi'
Merge a fix for a recent thermal-related regression in the ACPI
processor driver.
* thermal-acpi:
ACPI: processor: thermal: Update CPU cooling devices on cpufreq policy changes
thermal: core: Introduce thermal_cooling_device_update()
thermal: core: Introduce thermal_cooling_device_present()
ACPI: processor: Reorder acpi_processor_driver_init()
Diffstat (limited to 'drivers/acpi/processor_thermal.c')
| -rw-r--r-- | drivers/acpi/processor_thermal.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index e534fd49a67e..b7c6287eccca 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c @@ -140,9 +140,13 @@ void acpi_thermal_cpufreq_init(struct cpufreq_policy *policy) ret = freq_qos_add_request(&policy->constraints, &pr->thermal_req, FREQ_QOS_MAX, INT_MAX); - if (ret < 0) + if (ret < 0) { pr_err("Failed to add freq constraint for CPU%d (%d)\n", cpu, ret); + continue; + } + + thermal_cooling_device_update(pr->cdev); } } @@ -153,8 +157,12 @@ void acpi_thermal_cpufreq_exit(struct cpufreq_policy *policy) for_each_cpu(cpu, policy->related_cpus) { struct acpi_processor *pr = per_cpu(processors, cpu); - if (pr) - freq_qos_remove_request(&pr->thermal_req); + if (!pr) + continue; + + freq_qos_remove_request(&pr->thermal_req); + + thermal_cooling_device_update(pr->cdev); } } #else /* ! CONFIG_CPU_FREQ */ |