platform/x86: intel_turbo_max_3: Switch to new Intel CPU model defines

aegl · ij-intel · commit 70a4fa3f4fc1 · 2024-06-03T09:49:05.000+03:00
New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck@intel.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20240531203706.233365-6-tony.luck@intel.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
diff --git a/drivers/platform/x86/intel/turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3.c
@@ -114,8 +114,8 @@ static int itmt_legacy_cpu_online(unsigned int cpu)
 }
 
 static const struct x86_cpu_id itmt_legacy_cpu_ids[] = {
-	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,	NULL),
-	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,	NULL),
+	X86_MATCH_VFM(INTEL_BROADWELL_X,	NULL),
+	X86_MATCH_VFM(INTEL_SKYLAKE_X,	NULL),
 	{}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ static int itmt_legacy_cpu_online(unsigned int cpu)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`static const struct x86_cpu_id itmt_legacy_cpu_ids[] = {`
`117`		`- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL),`
`118`		`- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),`
	`117`	`+ X86_MATCH_VFM(INTEL_BROADWELL_X, NULL),`
	`118`	`+ X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),`
`119`	`119`	`{}`
`120`	`120`	`};`
`121`	`121`