From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: "Kenneth R. Crudup" <kenny@panix.com>
Cc: Zhang Rui <rui.zhang@intel.com>,
Linux PM list <linux-pm@vger.kernel.org>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: Re: [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: add support for MMIO RAPL") boot failure]
Date: Fri, 19 Jul 2019 10:30:24 +0200 [thread overview]
Message-ID: <1780736.Kzs3HF7DM6@kreacher> (raw)
In-Reply-To: <alpine.DEB.2.21.1907182308321.2769@hp-x360>
On Friday, July 19, 2019 8:13:22 AM CEST Kenneth R. Crudup wrote:
>
> On Fri, 19 Jul 2019, Zhang Rui wrote:
>
> > Are you using the latest Linus' tree today?
>
> Yeah, Linus' master tree, as of the time of this E-mail (no new commits since
> mid-afternoon Thursday PDT).
>
> "lspci --vvnn" is attached.
Also please let me know if the appended patch helps.
---
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 4 ++++
1 file changed, 4 insertions(+)
Index: linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct
rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep);
if (ret < 0) {
powercap_unregister_control_type(rapl_mmio_priv.control_type);
+ rapl_mmio_priv.control_type = NULL:
return ret;
}
rapl_mmio_priv.pcap_rapl_online = ret;
@@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct
static void proc_thermal_rapl_remove(void)
{
+ if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
+ return;
+
cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
powercap_unregister_control_type(rapl_mmio_priv.control_type);
}
next prev parent reply other threads:[~2019-07-19 8:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <alpine.DEB.2.21.1907181955330.2769@hp-x360>
[not found] ` <1563514893.2433.3.camel@intel.com>
2019-07-19 6:13 ` [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: add support for MMIO RAPL") boot failure] Kenneth R. Crudup
2019-07-19 7:51 ` Rafael J. Wysocki
2019-07-19 13:03 ` Kenneth R. Crudup
2019-07-19 15:34 ` Zhang Rui
2019-07-19 17:31 ` Kenneth R. Crudup
2019-07-20 1:25 ` Zhang Rui
2019-07-20 10:18 ` Rafael J. Wysocki
2019-07-20 12:09 ` Rafael J. Wysocki
2019-07-19 8:30 ` Rafael J. Wysocki [this message]
2019-07-19 11:28 ` Zhang, Rui
2019-07-19 12:33 ` Zhang, Rui
2019-07-19 15:35 ` Zhang Rui
2019-07-20 12:11 ` Rafael J. Wysocki
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=1780736.Kzs3HF7DM6@kreacher \
--to=rjw@rjwysocki.net \
--cc=kenny@panix.com \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).