Commit 655e52d2 authored Sep 19, 2016 by Prarit Bhargava Committed by Thomas Gleixner Sep 20, 2016

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 <prarit@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Link: http://lkml.kernel.org/r/1474289501-31717-2-git-send-email-prarit@redhat.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent f99fd22e

arch/x86/kernel/tsc.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message