From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbcISXHi (ORCPT ); Mon, 19 Sep 2016 19:07:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40970 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbcISXHg (ORCPT ); Mon, 19 Sep 2016 19:07:36 -0400 Date: Mon, 19 Sep 2016 16:06:41 -0700 From: tip-bot for Prarit Bhargava Message-ID: Cc: luto@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, prarit@redhat.com, len.brown@intel.com, aquini@redhat.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, aquini@redhat.com, prarit@redhat.com, len.brown@intel.com, luto@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <1474289501-31717-2-git-send-email-prarit@redhat.com> References: <1474289501-31717-2-git-send-email-prarit@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/timers] x86/tsc: Use cpu id defines instead of hex constants Git-Commit-ID: 655e52d2b62458032fc67ff7daaa664af6f36fb5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 655e52d2b62458032fc67ff7daaa664af6f36fb5 Gitweb: http://git.kernel.org/tip/655e52d2b62458032fc67ff7daaa664af6f36fb5 Author: Prarit Bhargava AuthorDate: Mon, 19 Sep 2016 08:51:40 -0400 Committer: Thomas Gleixner CommitDate: Tue, 20 Sep 2016 01:00:32 +0200 x86/tsc: Use cpu id defines instead of hex constants asm/intel-family.h contains defines for cpu ids which should be used instead of hex constants. Convert the switch case in native_calibrate_tsc() to use the defines before adding more cpu models. [ tglx: Massaged changelog ] Signed-off-by: Prarit Bhargava Cc: Len Brown Cc: Rafael Aquini Cc: "Peter Zijlstra (Intel)" Cc: Andy Lutomirski Link: http://lkml.kernel.org/r/1474289501-31717-2-git-send-email-prarit@redhat.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/tsc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 78b9cb5..2344758 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -23,6 +23,7 @@ #include #include #include +#include unsigned int __read_mostly cpu_khz; /* TSC clocks / usec, not used here */ EXPORT_SYMBOL(cpu_khz); @@ -686,11 +687,11 @@ unsigned long native_calibrate_tsc(void) if (crystal_khz == 0) { switch (boot_cpu_data.x86_model) { - case 0x4E: /* SKL */ - case 0x5E: /* SKL */ + case INTEL_FAM6_SKYLAKE_MOBILE: + case INTEL_FAM6_SKYLAKE_DESKTOP: crystal_khz = 24000; /* 24.0 MHz */ break; - case 0x5C: /* BXT */ + case INTEL_FAM6_ATOM_GOLDMONT: crystal_khz = 19200; /* 19.2 MHz */ break; }