From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752820AbcIIPSJ (ORCPT ); Fri, 9 Sep 2016 11:18:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55516 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbcIIPSG (ORCPT ); Fri, 9 Sep 2016 11:18:06 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Rafael Aquini , "Peter Zijlstra (Intel)" , Andy Lutomirski , Len Brown , lenb@kernel.org Subject: [PATCH] Add additional Intel CPU models to crystal_khz whitelist Date: Fri, 9 Sep 2016 11:18:03 -0400 Message-Id: <1473434283-11475-1-git-send-email-prarit@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 09 Sep 2016 15:18:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID"), the kernel added support for Intel processors which had a different CPU base-frequency and TSC frequency. The turbostat utility has been updated with KBL and SKX processors, and they should also be added to the crystal_khz white list. For example, on KBL (0x8E) native_calibrate_tsc() returns 0 MHz for tsc_khz and after this patch native_calibrate_tsc() returns 1608 MHz. Signed-off-by: Prarit Bhargava Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Rafael Aquini Cc: "Peter Zijlstra (Intel)" Cc: Andy Lutomirski Cc: Len Brown Cc: lenb@kernel.org --- arch/x86/kernel/tsc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 78b9cb5a26af..421ddbbf3fc8 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -688,11 +688,19 @@ unsigned long native_calibrate_tsc(void) switch (boot_cpu_data.x86_model) { case 0x4E: /* SKL */ case 0x5E: /* SKL */ + case 0x8E: /* KBL */ + case 0x9E: /* KBL */ crystal_khz = 24000; /* 24.0 MHz */ break; + case 0x55: /* SKX */ + crystal_khz = 25000; /* 25.0 MHz */ + break; case 0x5C: /* BXT */ crystal_khz = 19200; /* 19.2 MHz */ break; + default: + crystal_khz = 0; + } } -- 1.7.9.3