[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240529183605.17520-1-andrew.cooper3@citrix.com>
Date: Wed, 29 May 2024 19:36:05 +0100
From: Andrew Cooper <andrew.cooper3@...rix.com>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Andrew Cooper <andrew.cooper3@...rix.com>,
Tony Luck <tony.luck@...el.com>,
Dave Hansen <dave.hansen@...ux.intel.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>,
x86@...nel.org,
"H. Peter Anvin" <hpa@...or.com>,
Ashok Raj <ashok.raj@...el.com>,
Alison Schofield <alison.schofield@...el.com>
Subject: [PATCH] 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: 6568fc18c2f6 ("x86/cpu/intel: Switch to new Intel CPU model defines")
Signed-off-by: Andrew Cooper <andrew.cooper3@...rix.com>
---
CC: Tony Luck <tony.luck@...el.com>
CC: Dave Hansen <dave.hansen@...ux.intel.com>
CC: Thomas Gleixner <tglx@...utronix.de>
CC: Ingo Molnar <mingo@...hat.com>
CC: Borislav Petkov <bp@...en8.de>
CC: x86@...nel.org
CC: "H. Peter Anvin" <hpa@...or.com>
CC: Ashok Raj <ashok.raj@...el.com>
CC: Andrew Cooper <andrew.cooper3@...rix.com>
CC: Alison Schofield <alison.schofield@...el.com>
CC: linux-kernel@...r.kernel.org
---
arch/x86/kernel/cpu/intel.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index a813089ca408..a9ea0dba6f0c 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.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 */
- if (c->x86 == 6) {
- switch (c->x86_vfm) {
- case INTEL_ATOM_SALTWELL_MID:
- case INTEL_ATOM_SALTWELL_TABLET:
- case INTEL_ATOM_SILVERMONT_MID:
- case INTEL_ATOM_AIRMONT_NP:
- set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
- break;
- default:
- break;
- }
+ switch (c->x86_vfm) {
+ case INTEL_ATOM_SALTWELL_MID:
+ case INTEL_ATOM_SALTWELL_TABLET:
+ case INTEL_ATOM_SILVERMONT_MID:
+ case INTEL_ATOM_AIRMONT_NP:
+ set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
+ break;
}
/*
--
2.34.1
Powered by blists - more mailing lists