From: patrickg <patrickg@supermicro.com>
To: Prarit Bhargava <prarit@redhat.com>,
"Brown, Len" <len.brown@intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "mingo@kernel.org" <mingo@kernel.org>,
"Du, Alek" <alek.du@intel.com>,
"arjan@linux.intel.com" <arjan@linux.intel.com>,
"Tang, Feng" <feng.tang@intel.com>
Subject: Re: [RFC] x86, tsc: Add kcmdline args for skipping tsc calibration sequences
Date: Thu, 25 Oct 2018 12:13:26 -0700 [thread overview]
Message-ID: <f718c935-d5b4-111d-abe1-e7a61d08237b@supermicro.com> (raw)
In-Reply-To: <6e40fea8-9b42-3785-7d4d-36f120980d66@redhat.com>
Sorry for the delay; lkml folder sorting gone wrong.
On 10/25/18 11:01 AM, Prarit Bhargava wrote:
> Patrick can you reply back with the entire patch
Yes; watch the editor bork it even more than it originally did, though.
---Copypasta of first RFC patch---
---
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 74392d9..5a07d12 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -47,6 +47,13 @@ static DEFINE_STATIC_KEY_FALSE(__use_tsc);
int tsc_clocksource_reliable;
+/*
+ * TSC calibration sequence disablement
+ */
+int calibrate_cpuid_khz_disabled = 0;
+int calibrate_msr_disabled = 0;
+int calibrate_quick_disabled = 0;
+
static u32 art_to_tsc_numerator;
static u32 art_to_tsc_denominator;
static u64 art_to_tsc_offset;
@@ -281,6 +288,32 @@ static int __init tsc_setup(char *str)
__setup("tsc=", tsc_setup);
+static int __init setup_tsc_calibration_order(char *str)
+{
+ if (!str)
+ return -EINVAL;
+
+ while (*str) {
+ if (!strncmp(str, "nocpuid", 7)) {
+ calibrate_cpuid_khz_disabled = 1;
+ pr_info("TSC CPUID khz calibrate disabled\n");
+ } else if (!strncmp(str, "nomsr", 5)) {
+ calibrate_msr_disabled = 1;
+ pr_info("TSC msr calibrate disabled\n");
+ } else if (!strncmp(str, "noquick", 7)) {
+ calibrate_quick_disabled = 1;
+ pr_info("TSC quick calibrate disabled\n");
+ }
+
+ str += strcspn(str, ",");
+ while (*str == ',')
+ str++;
+ }
+ return 1;
+}
+
+__setup("tsc_calibrate=", setup_tsc_calibration_order);
+
#define MAX_RETRIES 5
#define SMI_TRESHOLD 50000
@@ -675,19 +708,25 @@ unsigned long native_calibrate_cpu(void)
unsigned long flags, latch, ms, fast_calibrate;
int hpet = is_hpet_enabled(), i, loopmin;
- fast_calibrate = cpu_khz_from_cpuid();
- if (fast_calibrate)
- return fast_calibrate;
+ if (!calibrate_cpuid_khz_disabled) {
+ fast_calibrate = cpu_khz_from_cpuid();
+ if (fast_calibrate)
+ return fast_calibrate;
+ }
- fast_calibrate = cpu_khz_from_msr();
- if (fast_calibrate)
- return fast_calibrate;
+ if (!calibrate_msr_disabled) {
+ fast_calibrate = cpu_khz_from_msr();
+ if (fast_calibrate)
+ return fast_calibrate;
+ }
- local_irq_save(flags);
- fast_calibrate = quick_pit_calibrate();
- local_irq_restore(flags);
- if (fast_calibrate)
- return fast_calibrate;
+ if (!calibrate_quick_disabled) {
+ local_irq_save(flags);
+ fast_calibrate = quick_pit_calibrate();
+ local_irq_restore(flags);
+ if (fast_calibrate)
+ return fast_calibrate;
+ }
/*
* Run 5 calibration loops to get the lowest frequency value
---
next prev parent reply other threads:[~2018-10-25 19:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 19:19 [RFC] x86, tsc: Add kcmdline args for skipping tsc calibration sequences patrickg
2018-07-13 19:40 ` Arjan van de Ven
2018-07-13 19:54 ` patrickg
2018-07-13 19:54 ` patrickg
2018-07-14 2:40 ` Brown, Len
2018-07-20 22:27 ` patrickg
2018-07-24 19:45 ` patrickg
2018-07-26 19:21 ` patrickg
2018-08-16 17:28 ` patrickg
2018-10-25 17:12 ` patrickg
2018-10-25 18:01 ` Prarit Bhargava
2018-10-25 19:13 ` patrickg [this message]
2018-12-03 19:37 ` Patrick Geary
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=f718c935-d5b4-111d-abe1-e7a61d08237b@supermicro.com \
--to=patrickg@supermicro.com \
--cc=alek.du@intel.com \
--cc=arjan@linux.intel.com \
--cc=feng.tang@intel.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=prarit@redhat.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).