From: Chen Yu <yu.c.chen@intel.com>
To: linux-pm@vger.kernel.org
Cc: inux-kernel@vger.kernel.org, Len Brown <lenb@kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Zhang Rui <rui.zhang@intel.com>, Ingo Molnar <mingo@kernel.org>,
Chen Yu <yu.c.chen@intel.com>
Subject: [PATCH 1/2][RFC v3] ACPI throttling: Disable the MSR T-state if enabled after resumed
Date: Wed, 8 Feb 2017 00:23:16 +0800 [thread overview]
Message-ID: <1fd9d91c7cbdd314ebb6e65264f57f430dfb89ca.1486483294.git.yu.c.chen@intel.com> (raw)
In-Reply-To: <cover.1486483294.git.yu.c.chen@intel.com>
Previously a bug was reported that on certain Broadwell
platform, after resumed from S3, the CPU is running at
an anomalously low speed, due to the BIOS has enabled the
MSR throttling across S3. The solution to this was to introduce
a quirk framework to save/restore tstate MSR register around
suspend/resume, in Commit 7a9c2dd08ead ("x86/pm:
Introduce quirk framework to save/restore extra MSR
registers around suspend/resume").
There are three problems here:
1. More and more reports show that other platforms also
encountered the same issue, so the quirk list might
be endless.
2. Each CPUs should take the save/restore operation into
consideration, rather than the nonboot CPU alone.
3. Normally ACPI T-state re-evaluation is done on resume,
however there is no _TSS on the bogus platform, thus
above re-evaluation code does not run on that machine.
Solution:
This patch is based on the fact that, we generally should not
expect the system to come back from resume with throttling
enabled, but leverage the OS components to deal with it,
such as thermal event. So we simply clear the MSR T-state
and print the warning if it is found to be enabled after
resumed back.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=90041
Reported-by: Kadir <kadir@colakoglu.nl>
Suggested-by: Len Brown <lenb@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
drivers/acpi/processor_throttling.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index a12f96c..3fb759d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -64,6 +64,7 @@ struct acpi_processor_throttling_arg {
static int acpi_processor_get_throttling(struct acpi_processor *pr);
int acpi_processor_set_throttling(struct acpi_processor *pr,
int state, bool force);
+static void throttling_msr_reevaluate(int cpu);
static int acpi_processor_update_tsd_coord(void)
{
@@ -386,6 +387,15 @@ void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
pr->flags.throttling = 0;
return;
}
+ /*
+ * It was found after resumed from suspend to ram, some BIOSes would
+ * adjust the MSR tstate, however on these platforms no _PSS is provided
+ * thus we never have a chance to adjust the MSR T-state anymore.
+ * Thus force clearing it if MSR T-state is enabled, because generally
+ * we never expect to come back from resume with throttling enabled.
+ * Later let other components to adjust T-state if necessary.
+ */
+ throttling_msr_reevaluate(pr->id);
/* the following is to recheck whether the T-state is valid for
* the online CPU
*/
@@ -758,6 +768,23 @@ static int acpi_throttling_wrmsr(u64 value)
}
return ret;
}
+
+static long msr_reevaluate_fn(void *data)
+{
+ u64 msr = 0;
+
+ acpi_throttling_rdmsr(&msr);
+ if (msr) {
+ printk_once(KERN_ERR "PM: The BIOS might have modified the MSR T-state, clear it for now.\n");
+ acpi_throttling_wrmsr(0);
+ }
+ return 0;
+}
+
+static void throttling_msr_reevaluate(int cpu)
+{
+ work_on_cpu(cpu, msr_reevaluate_fn, NULL);
+}
#else
static int acpi_throttling_rdmsr(u64 *value)
{
@@ -772,6 +799,12 @@ static int acpi_throttling_wrmsr(u64 value)
"HARDWARE addr space,NOT supported yet\n");
return -1;
}
+
+static void throttling_msr_reevaluate(int cpu)
+{
+ return -1;
+}
+
#endif
static int acpi_read_throttling_status(struct acpi_processor *pr,
--
2.7.4
next prev parent reply other threads:[~2017-02-07 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 16:15 [PATCH 0/2] Disable the MSR T-state if it is enabled after resumed Chen Yu
2017-02-07 16:23 ` Chen Yu [this message]
2017-02-07 16:55 ` [PATCH 1/2][RFC v3] ACPI throttling: Disable the MSR T-state if " Yu Chen
2017-02-13 2:17 ` Chen Yu
2017-02-07 16:25 ` [PATCH 2/2][RFC v3] x86/pm: Delete the quirk to save/restore extra MSR around suspend/resume Chen Yu
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=1fd9d91c7cbdd314ebb6e65264f57f430dfb89ca.1486483294.git.yu.c.chen@intel.com \
--to=yu.c.chen@intel.com \
--cc=inux-kernel@vger.kernel.org \
--cc=lenb@kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=rui.zhang@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).