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

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

[Andrew Cooper]

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@citrix.com>
---
CC: Tony Luck <tony.luck@intel.com>
CC: Dave Hansen <dave.hansen@linux.intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: Borislav Petkov <bp@alien8.de>
CC: x86@kernel.org
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ashok Raj <ashok.raj@intel.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Alison Schofield <alison.schofield@intel.com>
CC: linux-kernel@vger.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

Re: [PATCH] x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines

[Dave Hansen]

On 5/29/24 11:36, Andrew Cooper wrote:
> The outer if () should have been dropped when switching to c->x86_vfm.

FWIW, we are going to need to do a pass over all of arch/x86 looking for
these.  I suspect many of the 'if (c->x86 == ...) ' checks can go away
like this one.

Thanks for finding this one, though!

RE: [PATCH] x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines

[Luck, Tony]

>> The outer if () should have been dropped when switching to c->x86_vfm.
>
> FWIW, we are going to need to do a pass over all of arch/x86 looking for
> these.  I suspect many of the 'if (c->x86 == ...) ' checks can go away
> like this one.
>
> Thanks for finding this one, though!

Yup.

Acked-by: Tony Luck <tony.luck@intel.com>

Re: [PATCH] x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines

[Andrew Cooper]

On 29/05/2024 7:59 pm, Luck, Tony wrote:
>>> The outer if () should have been dropped when switching to c->x86_vfm.
>> FWIW, we are going to need to do a pass over all of arch/x86 looking for
>> these.  I suspect many of the 'if (c->x86 == ...) ' checks can go away
>> like this one.
>>
>> Thanks for finding this one, though!
> Yup.
>
> Acked-by: Tony Luck <tony.luck@intel.com>

Thanks.  FWIW, none of the other uses of c->x86 I looked at seem trivial
to convert.

This one I only happened to notice because it stood out in context.

~Andrew

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

[tip-bot2 for Andrew Cooper]

The following commit has been merged into the x86/cpu branch of tip:

Commit-ID:     34b3fc558b537bdf99644dcde539e151716f6331
Gitweb:        https://git.kernel.org/tip/34b3fc558b537bdf99644dcde539e151716f6331
Author:        Andrew Cooper <andrew.cooper3@citrix.com>
AuthorDate:    Wed, 29 May 2024 19:36:05 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sat, 29 Jun 2024 16:10:37 +02:00

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@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
---
 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 a813089..a9ea0db 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;
 	}
 
 	/*