Commit-ID: 655e52d2b62458032fc67ff7daaa664af6f36fb5 Gitweb: http://git.kernel.org/tip/655e52d2b62458032fc67ff7daaa664af6f36fb5 Author: Prarit Bhargava <pra...@redhat.com> AuthorDate: Mon, 19 Sep 2016 08:51:40 -0400 Committer: Thomas Gleixner <t...@linutronix.de> 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 <pra...@redhat.com> Cc: Len Brown <len.br...@intel.com> Cc: Rafael Aquini <aqu...@redhat.com> Cc: "Peter Zijlstra (Intel)" <pet...@infradead.org> Cc: Andy Lutomirski <l...@kernel.org> Link: http://lkml.kernel.org/r/1474289501-31717-2-git-send-email-pra...@redhat.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- 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 <asm/x86_init.h> #include <asm/geode.h> #include <asm/apic.h> +#include <asm/intel-family.h> 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; }
