linux.git/drivers/thermal/cpu_cooling.c, branch v4.19.192

thermal/drivers/cpufreq_cooling: Fix wrong frequency converted from power

2020-07-22T07:32:12+00:00

commit 371a3bc79c11b707d7a1b7a2c938dc3cc042fffb upstream.

The function cpu_power_to_freq is used to find a frequency and set the
cooling device to consume at most the power to be converted. For example,
if the power to be converted is 80mW, and the em table is as follow.
struct em_cap_state table[] = {
	/* KHz     mW */
	{ 1008000, 36, 0 },
	{ 1200000, 49, 0 },
	{ 1296000, 59, 0 },
	{ 1416000, 72, 0 },
	{ 1512000, 86, 0 },
};
The target frequency should be 1416000KHz, not 1512000KHz.

Fixes: 349d39dc5739 ("thermal: cpu_cooling: merge frequency and power tables")
Cc:  # v4.13+
Signed-off-by: Finley Xiao 
Acked-by: Viresh Kumar 
Reviewed-by: Amit Kucheria 
Signed-off-by: Daniel Lezcano 
Link: https://lore.kernel.org/r/20200619090825.32747-1-finley.xiao@rock-chips.com
Signed-off-by: Viresh Kumar 
Signed-off-by: Greg Kroah-Hartman

thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power

2020-01-27T13:50:48+00:00

[ Upstream commit bf45ac18b78038e43af3c1a273cae4ab5704d2ce ]

The CPU load values passed to the thermal_power_cpu_get_power
tracepoint are zero for all CPUs, unless, unless the
thermal_power_cpu_limit tracepoint is enabled too:

  irq/41-rockchip-98    [000] ....   290.972410: thermal_power_cpu_get_power:
  cpus=0000000f freq=1800000 load={{0x0,0x0,0x0,0x0}} dynamic_power=4815

vs

  irq/41-rockchip-96    [000] ....    95.773585: thermal_power_cpu_get_power:
  cpus=0000000f freq=1800000 load={{0x56,0x64,0x64,0x5e}} dynamic_power=4959
  irq/41-rockchip-96    [000] ....    95.773596: thermal_power_cpu_limit:
  cpus=0000000f freq=408000 cdev_state=10 power=416

There seems to be no good reason for omitting the CPU load information
depending on another tracepoint. My guess is that the intention was to
check whether thermal_power_cpu_get_power is (still) enabled, however
'load_cpu != NULL' already indicates that it was at least enabled when
cpufreq_get_requested_power() was entered, there seems little gain
from omitting the assignment if the tracepoint was just disabled, so
just remove the check.

Fixes: 6828a4711f99 ("thermal: add trace events to the power allocator governor")
Signed-off-by: Matthias Kaehlcke 
Reviewed-by: Daniel Lezcano 
Acked-by: Javi Merino 
Acked-by: Viresh Kumar 
Signed-off-by: Eduardo Valentin 
Signed-off-by: Sasha Levin

cpu_cooling: Drop static-power related stuff

2017-12-07T21:52:01+00:00

No one has used it for the last two and half years (since it was
introduced by commit c36cf0717631 (thermal: cpu_cooling: implement the
power cooling device API), get rid of it.

Acked-by: Eduardo Valentin 
Signed-off-by: Viresh Kumar 
Signed-off-by: Rafael J. Wysocki

cpu_cooling: Keep only one of_cpufreq*cooling_register() helper

2017-12-07T21:52:01+00:00

of_cpufreq_cooling_register() isn't used by anyone and so can be
removed, but then we would be left with two routines:
cpufreq_cooling_register() and of_cpufreq_power_cooling_register() that
would look odd.

Remove current implementation of of_cpufreq_cooling_register() and
rename of_cpufreq_power_cooling_register() as
of_cpufreq_cooling_register(). This simplifies lots of stuff.

Acked-by: Eduardo Valentin 
Signed-off-by: Viresh Kumar 
Signed-off-by: Rafael J. Wysocki

cpu_cooling: Remove unused cpufreq_power_cooling_register()

2017-12-07T21:52:01+00:00

It isn't used by anyone, drop it.

Acked-by: Eduardo Valentin 
Signed-off-by: Viresh Kumar 
Signed-off-by: Rafael J. Wysocki

cpu_cooling: Make of_cpufreq_power_cooling_register() parse DT

2017-12-07T21:52:01+00:00

All the callers of of_cpufreq_power_cooling_register() have almost
identical code and it makes more sense to move that code into the helper
as its all about reading DT properties.

This got rid of lot of redundant code.

Acked-by: Eduardo Valentin 
Signed-off-by: Viresh Kumar 
Signed-off-by: Rafael J. Wysocki

thermal: cpu_cooling: pr_err() strings should end with newlines

2017-11-01T02:32:19+00:00

pr_err() messages should end with a new-line to avoid other messages
being concatenated.

Acked-by: Viresh Kumar 
Acked-by: Javi Merino 
Signed-off-by: Arvind Yadav 
Signed-off-by: Eduardo Valentin

thermal: cpu_cooling: Replace kmalloc with kmalloc_array

2017-05-28T00:33:04+00:00

Checkpatch reports following:

WARNING: Prefer kmalloc_array over kmalloc with multiply
+	cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev->freq_table) * i,

Fix that.

Signed-off-by: Viresh Kumar 
Signed-off-by: Eduardo Valentin

thermal: cpu_cooling: Rearrange struct cpufreq_cooling_device

2017-05-28T00:33:02+00:00

This shrinks the size of the structure on arm64 by 8 bytes by avoiding
padding of 4 bytes at two places.

Also add missing doc comment for freq_table

Signed-off-by: Viresh Kumar 
Reviewed-by: Lukasz Luba 
Tested-by: Lukasz Luba 
Signed-off-by: Eduardo Valentin

thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power()

2017-05-28T00:32:59+00:00

The frequency table shouldn't have any zero frequency entries and so
such a check isn't required. Though it would be better to make sure
'state' is within limits.

Signed-off-by: Viresh Kumar 
Reviewed-by: Lukasz Luba 
Tested-by: Lukasz Luba 
Signed-off-by: Eduardo Valentin