Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 34b3fc5

Browse files
andyhhpbp3tk0v
authored andcommitted
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: 6568fc1 ("x86/cpu/intel: Switch to new Intel CPU model defines") Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/r/20240529183605.17520-1-andrew.cooper3@citrix.com
1 parent 78ce84b commit 34b3fc5

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

arch/x86/kernel/cpu/intel.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -294,17 +294,13 @@ static void early_init_intel(struct cpuinfo_x86 *c)
294294
}
295295

296296
/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
297-
if (c->x86 == 6) {
298-
switch (c->x86_vfm) {
299-
case INTEL_ATOM_SALTWELL_MID:
300-
case INTEL_ATOM_SALTWELL_TABLET:
301-
case INTEL_ATOM_SILVERMONT_MID:
302-
case INTEL_ATOM_AIRMONT_NP:
303-
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
304-
break;
305-
default:
306-
break;
307-
}
297+
switch (c->x86_vfm) {
298+
case INTEL_ATOM_SALTWELL_MID:
299+
case INTEL_ATOM_SALTWELL_TABLET:
300+
case INTEL_ATOM_SILVERMONT_MID:
301+
case INTEL_ATOM_AIRMONT_NP:
302+
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
303+
break;
308304
}
309305

310306
/*

0 commit comments

Comments
 (0)