Commit 34b3fc55 authored by Andrew Cooper's avatar Andrew Cooper Committed by Borislav Petkov (AMD)

x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines

The outer if () should have been dropped when switching to c->x86_vfm.

Fixes: 6568fc18 ("x86/cpu/intel: Switch to new Intel CPU model defines")
Signed-off-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240529183605.17520-1-andrew.cooper3@citrix.com
parent 78ce84b9
...@@ -294,17 +294,13 @@ static void early_init_intel(struct cpuinfo_x86 *c) ...@@ -294,17 +294,13 @@ static void early_init_intel(struct cpuinfo_x86 *c)
} }
/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */ /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
if (c->x86 == 6) { switch (c->x86_vfm) {
switch (c->x86_vfm) { case INTEL_ATOM_SALTWELL_MID:
case INTEL_ATOM_SALTWELL_MID: case INTEL_ATOM_SALTWELL_TABLET:
case INTEL_ATOM_SALTWELL_TABLET: case INTEL_ATOM_SILVERMONT_MID:
case INTEL_ATOM_SILVERMONT_MID: case INTEL_ATOM_AIRMONT_NP:
case INTEL_ATOM_AIRMONT_NP: set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3); break;
break;
default:
break;
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment