linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
Subject: [PATCH 08/10] x86 tsc_msr: Remove irqoff around MSR-based TSC enumeration
Date: Fri, 17 Jun 2016 01:22:50 -0400	[thread overview]
Message-ID: <a6b5c3ecd3b068175d2309599ab28163fc34215e.1466138954.git.len.brown@intel.com> (raw)
In-Reply-To: <20160617052252.25991-1-lenb@kernel.org>
In-Reply-To: <2199d0e959f7f71a18827268b5d060f8d3831639.1466138954.git.len.brown@intel.com>

From: Len Brown <len.brown@intel.com>

Remove the irqoff/irqon around MSR-based TSC enumeration,
as it is not necessary.

Also rename: try_msr_calibrate_tsc() to cpu_khz_from_msr(),
as that better describes what the routine does.

Signed-off-by: Len Brown <len.brown@intel.com>
---
 arch/x86/include/asm/tsc.h | 3 +--
 arch/x86/kernel/tsc.c      | 5 +----
 arch/x86/kernel/tsc_msr.c  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 7428697..db1f779 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -52,7 +52,6 @@ extern int notsc_setup(char *);
 extern void tsc_save_sched_clock_state(void);
 extern void tsc_restore_sched_clock_state(void);
 
-/* MSR based TSC calibration for Intel Atom SoC platforms */
-unsigned long try_msr_calibrate_tsc(void);
+unsigned long cpu_khz_from_msr(void);
 
 #endif /* _ASM_X86_TSC_H */
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 38ba6de..35a3976 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -674,10 +674,7 @@ unsigned long native_calibrate_tsc(void)
 	unsigned long flags, latch, ms, fast_calibrate;
 	int hpet = is_hpet_enabled(), i, loopmin;
 
-	/* Calibrate TSC using MSR for Intel Atom SoCs */
-	local_irq_save(flags);
-	fast_calibrate = try_msr_calibrate_tsc();
-	local_irq_restore(flags);
+	fast_calibrate = cpu_khz_from_msr();
 	if (fast_calibrate)
 		return fast_calibrate;
 
diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index 9d56ebd..e0c2b30 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -68,7 +68,7 @@ static int match_cpu(u8 family, u8 model)
  * Set global "lapic_timer_frequency" to bus_clock_cycles/jiffy
  * Return processor base frequency in KHz, or 0 on failure.
  */
-unsigned long try_msr_calibrate_tsc(void)
+unsigned long cpu_khz_from_msr(void)
 {
 	u32 lo, hi, ratio, freq_id, freq;
 	unsigned long res;
-- 
2.9.0

  parent reply	other threads:[~2016-06-17  5:24 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-17  5:22 [PATCH 0/10] x86/tsc: fast calibration updates Len Brown
2016-06-17  5:22 ` [PATCH 01/10] Revert "x86/tsc: Add missing Cherrytrail frequency to the table" Len Brown
2016-06-17  5:22   ` [PATCH 02/10] x86 tsc_msr: Identify Intel-specific code Len Brown
2016-07-10 18:10     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 03/10] x86 tsc_msr: Remove debugging messages Len Brown
2016-07-10 18:10     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 04/10] x86 tsc_msr: Update comments, expand definitions Len Brown
2016-07-10 18:11     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 05/10] x86 tsc_msr: Correct Silvermont reference clock values Len Brown
2016-07-10 18:11     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 06/10] x86 tsc_msr: Add Airmont " Len Brown
2016-07-10 18:12     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 07/10] x86 tsc_msr: Extend to include Intel Core Architecture Len Brown
2016-07-10 18:12     ` [tip:x86/timers] x86/tsc_msr: " tip-bot for Len Brown
2016-06-17  5:22   ` Len Brown [this message]
2016-07-10 18:12     ` [tip:x86/timers] x86/tsc_msr: Remove irqoff around MSR-based TSC enumeration tip-bot for Len Brown
2016-07-11 19:33     ` tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 09/10] x86 tsc: enumerate SKL cpu_khz and tsc_khz via CPUID Len Brown
2016-07-10 18:13     ` [tip:x86/timers] x86/tsc: Enumerate " tip-bot for Len Brown
2016-07-11 19:34     ` tip-bot for Len Brown
2016-06-17  5:22   ` [PATCH 10/10] x86 tsc: enumerate BXT " Len Brown
2016-07-10 18:13     ` [tip:x86/timers] x86/tsc: Enumerate " tip-bot for Len Brown
2016-07-11 19:34     ` tip-bot for Len Brown
2016-07-10 18:09   ` [tip:x86/timers] Revert "x86/tsc: Add missing Cherrytrail frequency to the table" tip-bot for Len Brown
2016-06-17  7:36 ` [PATCH 0/10] x86/tsc: fast calibration updates Thomas Gleixner

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=a6b5c3ecd3b068175d2309599ab28163fc34215e.1466138954.git.len.brown@intel.com \
    --to=lenb@kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    /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).