[PATCH 7/9] x86 tsc_msr: Remove irqoff around MSR-based TSC enumeration

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Len Brown <lenb@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 7/9] x86 tsc_msr: Remove irqoff around MSR-based TSC enumeration
Date	Thu, 31 Mar 2016 06:20:02 +0200
Message-ID	<riCfo-7Lb-7@gated-at.bofh.it> (permalink)
References	<riCfn-7Lb-3@gated-at.bofh.it>
X-Original-To	x86@kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:reply-to:organization; bh=uN6EREJDGjZgfpPmxyO0Np5MhGYP7bfU54GEalEX3Hs=; b=artYtOq+OhiZpx1vTfZnQkvam85mg+qlDkW6cXuN4EjwR+R9gGXWAEN+2mhQ4jTDPt ZVGfWdpLg7owIZuDNChD7luQTpGW4xSX/3tgB6vIcOkYKPXhczvES9eNvLDiwQDDGNQ6 +c+0oXtDEwhlkxB38Zn+HeDBA2d7W8cDilrrBnRDvikDHcduwIu9B6fE/RFYj+d90Pil XbXihbkj6DmMCVaj3gqyfKJGkkHsejCAeKKbXzlPJoBRyMqjXOgvkmUl2KReVnC4Ynku xZSXxSXNMpuBy6mBYbcAzolPvzDp0G3jolBCOKkBcHeSsPZEyX3HXCk/7Jk7UR6girg9 AkXw==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=uN6EREJDGjZgfpPmxyO0Np5MhGYP7bfU54GEalEX3Hs=; b=Z3q0Ssrmc/cero2B4TIbhrQH9zbe9aIQVtgSqWpbMfGu4z1L6tOt6kDS9MULh+CHCH bJ4BYsbMIe9YknOhwsfPfWio9bHfQezCBR7KPBakUn+ipVyK3O4d6a4g43be/ks15Tgu vIvmDdygMp2HHWaNq8SX3dqJB/MvKVmLkfp7JCLXy3EWW68t+qETiHOjXUBexOLcY8Si HJ1AHvK2hw0lkLiCgIYhfBKray+nBrb3PK6N6HQEp2HAA+OFd3iDcO2XPIR4l3uYbWds mICyjM9ShVlMo/IKMsP7aKPvbECTZJTMRWzNSJV4SWfmmZI0z1oMWhBia57SDT710dkE 5Qpw==
X-Gm-Message-State	AD7BkJK4AiOrEdkw65G86JbECM2g5FYd1501VS2Xac59SR8hk8DhTpslSfafWEij0VdN7A==
X-Received	by 10.13.220.69 with SMTP id f66mr6044634ywe.132.1459397678893; Wed, 30 Mar 2016 21:14:38 -0700 (PDT)
X-Mailer	git-send-email 2.8.0.rc4.16.g56331f8
Reply-To	Len Brown <lenb@kernel.org>
Organization	Intel Open Source Technology Center
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	59
X-Original-Cc	linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
X-Original-Date	Thu, 31 Mar 2016 00:13:53 -0400
X-Original-Message-ID	<433f82c8ab3fcaa7ff3b852d01cc74dbdf6d94f1.1459397558.git.len.brown@intel.com>
X-Original-References	<1459397635-4871-1-git-send-email-lenb@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1367799

Show key headers only | View raw

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 174c421..d634f2a 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 c9c4c7c..0ffb57f 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 c8ea977..b0839c5 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.8.0.rc4.16.g56331f8

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 7/9] x86 tsc_msr: Remove irqoff around MSR-based TSC enumeration Len Brown <lenb@kernel.org> - 2016-03-31 06:20 +0200

csiph-web