From: Tony Luck <tony.luck@intel.com>
Date: Mon, 20 May 2024 22:46:05 +0000 (-0700)
Subject: x86/boot: Switch to new Intel CPU model defines
X-Git-Tag: microblaze-v6.13~697^2~5
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=6fd5e8855e60a94f6f4b78a1314afac56fce7427;p=linux-2.6-microblaze.git

x86/boot: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model but
boot code doesn't have all the infrastructure to use them. Hard
code the one CPU model number used here.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240520224620.9480-35-tony.luck%40intel.com
---

diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
index fed8d13ce252..0aae4d4ed615 100644
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
@@ -203,7 +203,7 @@ int check_knl_erratum(void)
 	 */
 	if (!is_intel() ||
 	    cpu.family != 6 ||
-	    cpu.model != INTEL_FAM6_XEON_PHI_KNL)
+	    cpu.model != 0x57 /*INTEL_XEON_PHI_KNL*/)
 		return 0;
 
 	/*