linux-kernel - [tip:x86/urgent] x86/tsc: Read all ratio bits from MSR_PLATFORM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 6 May 2016 02:54:38 -0700
From:	tip-bot for Chen Yu <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	yu.c.chen@...el.com, mingo@...nel.org, rafael@...nel.org,
	bin.gao@...el.com, lenb@...nel.org, tglx@...utronix.de,
	linux-kernel@...r.kernel.org, hpa@...or.com
Subject: [tip:x86/urgent] x86/tsc: Read all ratio bits from
 MSR_PLATFORM_INFO

Commit-ID:  886123fb3a8656699dff40afa0573df359abeb18
Gitweb:     http://git.kernel.org/tip/886123fb3a8656699dff40afa0573df359abeb18
Author:     Chen Yu <yu.c.chen@...el.com>
AuthorDate: Fri, 6 May 2016 11:33:39 +0800
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 6 May 2016 11:50:50 +0200

x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO

Currently we read the tsc radio: ratio = (MSR_PLATFORM_INFO >> 8) & 0x1f;

Thus we get bit 8-12 of MSR_PLATFORM_INFO, however according to the SDM
(35.5), the ratio bits are bit 8-15.

Ignoring the upper bits can result in an incorrect tsc ratio, which causes the
TSC calibration and the Local APIC timer frequency to be incorrect.

Fix this problem by masking 0xff instead.

[ tglx: Massaged changelog ]

Fixes: 7da7c1561366 "x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs"
Signed-off-by: Chen Yu <yu.c.chen@...el.com>
Cc: "Rafael J. Wysocki" <rafael@...nel.org>
Cc: stable@...r.kernel.org
Cc: Bin Gao <bin.gao@...el.com>
Cc: Len Brown <lenb@...nel.org>
Link: http://lkml.kernel.org/r/1462505619-5516-1-git-send-email-yu.c.chen@intel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86/kernel/tsc_msr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index 92ae6ac..6aa0f4d 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -92,7 +92,7 @@ unsigned long try_msr_calibrate_tsc(void)

 	if (freq_desc_tables[cpu_index].msr_plat) {
 		rdmsr(MSR_PLATFORM_INFO, lo, hi);
-		ratio = (lo >> 8) & 0x1f;
+		ratio = (lo >> 8) & 0xff;
 	} else {
 		rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
 		ratio = (hi >> 8) & 0x1f;