Skip to content

Commit 05a6bd3

Browse files
committed
x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines
JIRA: https://issues.redhat.com/browse/RHEL-68394 commit 34b3fc5 Author: Andrew Cooper <andrew.cooper3@citrix.com> Date: Wed May 29 19:36:05 2024 +0100 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 Signed-off-by: David Arcari <darcari@redhat.com>
1 parent 040f0b9 commit 05a6bd3

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
@@ -348,17 +348,13 @@ static void early_init_intel(struct cpuinfo_x86 *c)
348348
}
349349

350350
/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
351-
if (c->x86 == 6) {
352-
switch (c->x86_vfm) {
353-
case INTEL_ATOM_SALTWELL_MID:
354-
case INTEL_ATOM_SALTWELL_TABLET:
355-
case INTEL_ATOM_SILVERMONT_MID:
356-
case INTEL_ATOM_AIRMONT_NP:
357-
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
358-
break;
359-
default:
360-
break;
361-
}
351+
switch (c->x86_vfm) {
352+
case INTEL_ATOM_SALTWELL_MID:
353+
case INTEL_ATOM_SALTWELL_TABLET:
354+
case INTEL_ATOM_SILVERMONT_MID:
355+
case INTEL_ATOM_AIRMONT_NP:
356+
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
357+
break;
362358
}
363359

364360
/*

0 commit comments

Comments
 (0)