| From f362ffeded34b89548432d8f3b2072670f27b9d9 Mon Sep 17 00:00:00 2001 |
| From: Rahul Tanwar <rahul.tanwar@linux.intel.com> |
| Date: Fri, 16 Aug 2019 16:18:57 +0800 |
| Subject: [PATCH] x86/cpu: Use constant definitions for CPU models |
| |
| commit bba10c5cab4ddd8725a7998e064fc72c9770c667 upstream. |
| |
| Replace model numbers with their respective macro definitions when |
| comparing CPU models. |
| |
| Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com> |
| Signed-off-by: Rahul Tanwar <rahul.tanwar@linux.intel.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Cc: alan@linux.intel.com |
| Cc: cheol.yong.kim@intel.com |
| Cc: Hans de Goede <hdegoede@redhat.com> |
| Cc: "H. Peter Anvin" <hpa@zytor.com> |
| Cc: Ingo Molnar <mingo@redhat.com> |
| Cc: qi-ming.wu@intel.com |
| Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Tony Luck <tony.luck@intel.com> |
| Cc: x86-ml <x86@kernel.org> |
| Link: https://lkml.kernel.org/r/f7a0e142faa953a53d5f81f78055e1b3c793b134.1565940653.git.rahul.tanwar@linux.intel.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c |
| index cc9f24818e49..c979a056a46f 100644 |
| --- a/arch/x86/kernel/cpu/intel.c |
| +++ b/arch/x86/kernel/cpu/intel.c |
| @@ -265,9 +265,9 @@ static void early_init_intel(struct cpuinfo_x86 *c) |
| /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */ |
| if (c->x86 == 6) { |
| switch (c->x86_model) { |
| - case 0x27: /* Penwell */ |
| - case 0x35: /* Cloverview */ |
| - case 0x4a: /* Merrifield */ |
| + case INTEL_FAM6_ATOM_SALTWELL_MID: |
| + case INTEL_FAM6_ATOM_SALTWELL_TABLET: |
| + case INTEL_FAM6_ATOM_SILVERMONT_MID: |
| set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3); |
| break; |
| default: |
| -- |
| 2.7.4 |
| |