Skip to content

Commit

Permalink
powercap: DTPM: Fix suspend failure and kernel warning
Browse files Browse the repository at this point in the history
When the ENERGY_MODEL and DTPM_CPU are enabled but actually without
any energy model, at cpu hotplug time, the dead cpuhp callback fails
leading to the warning.

Actually, the check could be simplified and we only do an action if
the dtpm cpu is enabled, otherwise we bail out without error.

Fixes: 7a89d7e ("powercap/drivers/dtpm: Simplify the dtpm table")
Reported-by: Kenneth R. Crudup <kenny@panix.com>
Tested-by: Kenneth R. Crudup <kenny@panix.com>
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Daniel Lezcano authored and Rafael J. Wysocki committed Nov 10, 2021
1 parent 8810075 commit 4d1cd14
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/powercap/dtpm_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,13 @@ static struct dtpm_ops dtpm_ops = {

static int cpuhp_dtpm_cpu_offline(unsigned int cpu)
{
struct em_perf_domain *pd;
struct dtpm_cpu *dtpm_cpu;

pd = em_cpu_get(cpu);
if (!pd)
return -EINVAL;

dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);
if (dtpm_cpu)
dtpm_update_power(&dtpm_cpu->dtpm);

return dtpm_update_power(&dtpm_cpu->dtpm);
return 0;
}

static int cpuhp_dtpm_cpu_online(unsigned int cpu)
Expand Down

0 comments on commit 4d1cd14

Please sign in to comment.