linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
	Linux PM <linux-pm@vger.kernel.org>,
	"Kenneth R . Crudup" <kenny@panix.com>,
	kernel test robot <oliver.sang@intel.com>,
	lkp@lists.01.org, kbuild test robot <lkp@intel.com>,
	Daniel Lezcano <daniel.lezcano@kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] powercap/drivers/dtpm_cpu: Fix suspend failure and kernel warning
Date: Wed, 10 Nov 2021 21:19:15 +0100	[thread overview]
Message-ID: <CAJZ5v0hYFiGa4MwiEx6czRPdEZmxWS7Wom5DKD2VueoDn+r3oA@mail.gmail.com> (raw)
In-Reply-To: <20211108062345.273855-1-daniel.lezcano@linaro.org>

On Mon, Nov 8, 2021 at 7:24 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> 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: 7a89d7eacf8e ("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>
> Cc: lkp@lists.01.org
> Cc: lkp@intel.com
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  drivers/powercap/dtpm_cpu.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
> index 69eb5101b5c7..477042199d90 100644
> --- a/drivers/powercap/dtpm_cpu.c
> +++ b/drivers/powercap/dtpm_cpu.c
> @@ -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)
> --

Applied as 5.16-rc material, thanks!

      reply	other threads:[~2021-11-10 20:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20211107095001.GC11442@xsang-OptiPlex-9020>
2021-11-08  6:23 ` Daniel Lezcano
2021-11-10 20:19   ` Rafael J. Wysocki [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJZ5v0hYFiGa4MwiEx6czRPdEZmxWS7Wom5DKD2VueoDn+r3oA@mail.gmail.com \
    --to=rafael@kernel.org \
    --cc=daniel.lezcano@kernel.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=kenny@panix.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=lkp@intel.com \
    --cc=lkp@lists.01.org \
    --cc=oliver.sang@intel.com \
    --subject='Re: [PATCH] powercap/drivers/dtpm_cpu: Fix suspend failure and kernel warning' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).