platform/x86:intel/pmc: Move PMC devid to core.h

Move PMC devid definition for each PMC of Arrow Lake and Meteor
Lake platforms to core.h. This patch is a preparation step to
introduce a new SSRAM Telemetry driver which will be using the
PMC devid.

Signed-off-by: Xi Pardee <xi.pardee@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250409191056.15434-4-xi.pardee@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
index 320993bd6d31de85d4efcb6c51898422b2e352ce..a6b2eb850ff0e36e06fac96d8b4038b215f22f67 100644 (file)
--- a/drivers/platform/x86/intel/pmc/arl.c
+++ b/drivers/platform/x86/intel/pmc/arl.c
@@ -651,29 +651,25 @@ static const struct pmc_reg_map arl_pchs_reg_map = {
        .etr3_offset = ETR3_OFFSET,
 };
 
-#define PMC_DEVID_SOCM 0x777f
-#define PMC_DEVID_SOCS 0xae7f
-#define PMC_DEVID_IOEP 0x7ecf
-#define PMC_DEVID_PCHS 0x7f27
 static struct pmc_info arl_pmc_info_list[] = {
        {
                .guid   = IOEP_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_IOEP,
+               .devid  = PMC_DEVID_ARL_IOEP,
                .map    = &mtl_ioep_reg_map,
        },
        {
                .guid   = SOCS_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_SOCS,
+               .devid  = PMC_DEVID_ARL_SOCS,
                .map    = &arl_socs_reg_map,
        },
        {
                .guid   = PCHS_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_PCHS,
+               .devid  = PMC_DEVID_ARL_PCHS,
                .map    = &arl_pchs_reg_map,
        },
        {
                .guid   = SOCM_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_SOCM,
+               .devid  = PMC_DEVID_ARL_SOCM,
                .map    = &mtl_socm_reg_map,
        },
        {}

diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
index 09aac6daabbd376a1961478865230082e00d4938..ce1b949b10040820f6eb7c1709f79fefceb1201d 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.h
+++ b/drivers/platform/x86/intel/pmc/core.h
@@ -298,6 +298,18 @@ enum ppfear_regs {
 #define PTL_PMC_LTR_CUR_PLT                    0x1C2C
 #define PTL_PCD_PMC_MMIO_REG_LEN               0x31A8
 
+/* SSRAM PMC Device ID */
+/* ARL */
+#define PMC_DEVID_ARL_SOCM     0x777f
+#define PMC_DEVID_ARL_SOCS     0xae7f
+#define PMC_DEVID_ARL_IOEP     0x7ecf
+#define PMC_DEVID_ARL_PCHS     0x7f27
+
+/* MTL */
+#define PMC_DEVID_MTL_SOCM     0x7e7f
+#define PMC_DEVID_MTL_IOEP     0x7ecf
+#define PMC_DEVID_MTL_IOEM     0x7ebf
+
 extern const char *pmc_lpm_modes[];
 
 struct pmc_bit_map {

diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index 8862829694a71b6dfc1170c02984f8138d3e0357..8f1b0165727784fad8a502de777f149f10554084 100644 (file)
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -947,23 +947,20 @@ static const struct pmc_reg_map mtl_ioem_reg_map = {
        .lpm_reg_index = MTL_LPM_REG_INDEX,
 };
 
-#define PMC_DEVID_SOCM 0x7e7f
-#define PMC_DEVID_IOEP 0x7ecf
-#define PMC_DEVID_IOEM 0x7ebf
 static struct pmc_info mtl_pmc_info_list[] = {
        {
                .guid   = SOCP_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_SOCM,
+               .devid  = PMC_DEVID_MTL_SOCM,
                .map    = &mtl_socm_reg_map,
        },
        {
                .guid   = IOEP_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_IOEP,
+               .devid  = PMC_DEVID_MTL_IOEP,
                .map    = &mtl_ioep_reg_map,
        },
        {
                .guid   = IOEM_LPM_REQ_GUID,
-               .devid  = PMC_DEVID_IOEM,
+               .devid  = PMC_DEVID_MTL_IOEM,
                .map    = &mtl_ioem_reg_map
        },
        {}