kevin/linux
1
Fork 0
Code

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

Browse Source 
New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240531203706.233365-4-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>
This commit is contained in:
Tony Luck 2024-05-31 13:36:59 -07:00 committed by Ilpo Järvinen
parent 0ff9c76fda
commit 5b3eaf10e2
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/platform/atom/punit_atom_debug.c
View File

@ -165,14 +165,13 @@ static void punit_s2idle_check_register(struct punit_device *punit_device) {}
static void punit_s2idle_check_unregister(void) {} static void punit_s2idle_check_unregister(void) {}
#endif #endif
#define X86_MATCH(model, data) \ #define X86_MATCH(vfm, data) \
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \ X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_MWAIT, data)
X86_FEATURE_MWAIT, data)
static const struct x86_cpu_id intel_punit_cpu_ids[] = { static const struct x86_cpu_id intel_punit_cpu_ids[] = {
X86_MATCH(ATOM_SILVERMONT, &punit_device_byt), X86_MATCH(INTEL_ATOM_SILVERMONT, &punit_device_byt),
X86_MATCH(ATOM_SILVERMONT_MID, &punit_device_tng), X86_MATCH(INTEL_ATOM_SILVERMONT_MID, &punit_device_tng),
X86_MATCH(ATOM_AIRMONT, &punit_device_cht), X86_MATCH(INTEL_ATOM_AIRMONT, &punit_device_cht),
{} {}
}; };
MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids); MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids);