2023-03-13 14:34:41

by Rafael J. Wysocki

Subject: [PATCH v2 4/4] ACPI: processor: thermal: Update CPU cooling devices on cpufreq policy changes

From: Rafael J. Wysocki <[email protected]>

When a cpufreq policy appears or goes away, the CPU cooling devices for
the CPUs covered by that policy need to be updated so that the new
processor_get_max_state() value is stored as max_state and the
statistics in sysfs are rearranged for each of them.

Do that accordingly in acpi_thermal_cpufreq_init() and
acpi_thermal_cpufreq_exit().

Fixes: a365105c685c("thermal: sysfs: Reuse cdev->max_state")
Reported-by: Wang, Quanxian <[email protected]>
Link: https://lore.kernel.org/linux-pm/[email protected]/
Signed-off-by: Rafael J. Wysocki <[email protected]>
---

v1 -> v2: Remove the now redundant IS_ERR() checks on cdev before calling
thermal_cooling_device_update().

---
drivers/acpi/processor_thermal.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

Index: linux-pm/drivers/acpi/processor_thermal.c
===================================================================
--- linux-pm.orig/drivers/acpi/processor_thermal.c
+++ linux-pm/drivers/acpi/processor_thermal.c
@@ -140,9 +140,13 @@ void acpi_thermal_cpufreq_init(struct cp
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 cp
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 */

2023-03-14 02:03:56

by Zhang, Rui

Subject: Re: [PATCH v2 4/4] ACPI: processor: thermal: Update CPU cooling devices on cpufreq policy changes

On Mon, 2023-03-13 at 15:34 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> When a cpufreq policy appears or goes away, the CPU cooling devices
> for
> the CPUs covered by that policy need to be updated so that the new
> processor_get_max_state() value is stored as max_state and the
> statistics in sysfs are rearranged for each of them.
>
> Do that accordingly in acpi_thermal_cpufreq_init() and
> acpi_thermal_cpufreq_exit().
>
> Fixes: a365105c685c("thermal: sysfs: Reuse cdev->max_state")
> Reported-by: Wang, Quanxian <[email protected]>
> Link:
> https://lore.kernel.org/linux-pm/[email protected]/
> Signed-off-by: Rafael J. Wysocki <[email protected]>

Tested-by: Zhang Rui <[email protected]>
Reviewed-by: Zhang Rui <[email protected]>

thanks,
rui

> ---
>
> v1 -> v2: Remove the now redundant IS_ERR() checks on cdev before
> calling
> thermal_cooling_device_update().
>
> ---
> drivers/acpi/processor_thermal.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> Index: linux-pm/drivers/acpi/processor_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/processor_thermal.c
> +++ linux-pm/drivers/acpi/processor_thermal.c
> @@ -140,9 +140,13 @@ void acpi_thermal_cpufreq_init(struct cp
> 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 cp
> 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 */
>
>
>