platform/x86/intel/pmc: Switch to new Intel CPU model defines

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-2-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/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index 2ad2f8753e5d408d430d1a73ced30d209881e76a..65eb09c7af6ae563088d7f50a779e65248f39dff 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1293,29 +1293,29 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev)
 }
 
 static const struct x86_cpu_id intel_pmc_core_ids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,           spt_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,             spt_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,          spt_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,            spt_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,        cnp_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,           icl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,        icl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,           cnp_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,         cnp_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,         tgl_l_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,           tgl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,        tgl_l_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,      icl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE,          tgl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,         tgl_l_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT,      tgl_l_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,           adl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        tgl_l_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          adl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,        adl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,        mtl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,           arl_core_init),
-       X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M,         lnl_core_init),
+       X86_MATCH_VFM(INTEL_SKYLAKE_L,          spt_core_init),
+       X86_MATCH_VFM(INTEL_SKYLAKE,            spt_core_init),
+       X86_MATCH_VFM(INTEL_KABYLAKE_L,         spt_core_init),
+       X86_MATCH_VFM(INTEL_KABYLAKE,           spt_core_init),
+       X86_MATCH_VFM(INTEL_CANNONLAKE_L,       cnp_core_init),
+       X86_MATCH_VFM(INTEL_ICELAKE_L,          icl_core_init),
+       X86_MATCH_VFM(INTEL_ICELAKE_NNPI,       icl_core_init),
+       X86_MATCH_VFM(INTEL_COMETLAKE,          cnp_core_init),
+       X86_MATCH_VFM(INTEL_COMETLAKE_L,        cnp_core_init),
+       X86_MATCH_VFM(INTEL_TIGERLAKE_L,        tgl_l_core_init),
+       X86_MATCH_VFM(INTEL_TIGERLAKE,          tgl_core_init),
+       X86_MATCH_VFM(INTEL_ATOM_TREMONT,       tgl_l_core_init),
+       X86_MATCH_VFM(INTEL_ATOM_TREMONT_L,     icl_core_init),
+       X86_MATCH_VFM(INTEL_ROCKETLAKE,         tgl_core_init),
+       X86_MATCH_VFM(INTEL_ALDERLAKE_L,        tgl_l_core_init),
+       X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,     tgl_l_core_init),
+       X86_MATCH_VFM(INTEL_ALDERLAKE,          adl_core_init),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_P,       tgl_l_core_init),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE,         adl_core_init),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_S,       adl_core_init),
+       X86_MATCH_VFM(INTEL_METEORLAKE_L,       mtl_core_init),
+       X86_MATCH_VFM(INTEL_ARROWLAKE,          arl_core_init),
+       X86_MATCH_VFM(INTEL_LUNARLAKE_M,        lnl_core_init),
        {}
 };
 

diff --git a/drivers/platform/x86/intel/pmc/pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c
index ddfba38c210444f70612cd707ec22db5931f9724..22cfcd4319873831c6547c6c4080a08423330055 100644 (file)
--- a/drivers/platform/x86/intel/pmc/pltdrv.c
+++ b/drivers/platform/x86/intel/pmc/pltdrv.c
@@ -35,14 +35,14 @@ static struct platform_device *pmc_core_device;
  * other list may grow, but this list should not.
  */
 static const struct x86_cpu_id intel_pmc_core_platform_ids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,           &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,             &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,          &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,            &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,        &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,           &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,           &pmc_core_device),
-       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,         &pmc_core_device),
+       X86_MATCH_VFM(INTEL_SKYLAKE_L,          &pmc_core_device),
+       X86_MATCH_VFM(INTEL_SKYLAKE,            &pmc_core_device),
+       X86_MATCH_VFM(INTEL_KABYLAKE_L,         &pmc_core_device),
+       X86_MATCH_VFM(INTEL_KABYLAKE,           &pmc_core_device),
+       X86_MATCH_VFM(INTEL_CANNONLAKE_L,       &pmc_core_device),
+       X86_MATCH_VFM(INTEL_ICELAKE_L,          &pmc_core_device),
+       X86_MATCH_VFM(INTEL_COMETLAKE,          &pmc_core_device),
+       X86_MATCH_VFM(INTEL_COMETLAKE_L,        &pmc_core_device),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids);