platform/x86:intel/pmc: Add support for multiple DMU GUIDs

Enable support for multiple DMU GUIDs to accommodate Arrow
Lake H/U platforms. Arrow Lake U/H may have several GUIDs
pointing to a single telemetry region providing die C6 value
Add support to search for available GUIDs.

Signed-off-by: Xi Pardee <xi.pardee@linux.intel.com>
Link: https://patch.msgid.link/20251014214548.629023-3-xi.pardee@linux.intel.com
[ij: add include & reverse logic in a loop]
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/arl.c b/drivers/platform/x86/intel/pmc/arl.c
index 17ad87b392abef0ae2ec482d347374e0c46d4d45..cc05a168c37213fef872a997b42b86e23d3bd61b 100644 (file)
--- a/drivers/platform/x86/intel/pmc/arl.c
+++ b/drivers/platform/x86/intel/pmc/arl.c
@@ -720,9 +720,10 @@ static int arl_h_core_init(struct pmc_dev *pmcdev, struct pmc_dev_info *pmc_dev_
        return generic_core_init(pmcdev, pmc_dev_info);
 }
 
+static u32 ARL_PMT_DMU_GUIDS[] = {ARL_PMT_DMU_GUID, 0x0};
 struct pmc_dev_info arl_pmc_dev = {
        .pci_func = 0,
-       .dmu_guid = ARL_PMT_DMU_GUID,
+       .dmu_guids = ARL_PMT_DMU_GUIDS,
        .regmap_list = arl_pmc_info_list,
        .map = &arl_socs_reg_map,
        .sub_req_show = &pmc_core_substate_req_regs_fops,
@@ -732,9 +733,10 @@ struct pmc_dev_info arl_pmc_dev = {
        .sub_req = pmc_core_pmt_get_lpm_req,
 };
 
+static u32 ARL_H_PMT_DMU_GUIDS[] = {ARL_PMT_DMU_GUID, 0x0};
 struct pmc_dev_info arl_h_pmc_dev = {
        .pci_func = 2,
-       .dmu_guid = ARL_PMT_DMU_GUID,
+       .dmu_guids = ARL_H_PMT_DMU_GUIDS,
        .regmap_list = arl_pmc_info_list,
        .map = &mtl_socm_reg_map,
        .sub_req_show = &pmc_core_substate_req_regs_fops,

diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index ac3d19ae8c56d5a76551a8ff8bb46217765ce391..ca126a253f9d0da843291a6efa68a6960f892042 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -20,6 +20,7 @@ enum header_type {
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/dmi.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -1281,7 +1282,20 @@ int get_primary_reg_base(struct pmc *pmc)
        return 0;
 }
 
-void pmc_core_punit_pmt_init(struct pmc_dev *pmcdev, u32 guid)
+static struct telem_endpoint *pmc_core_register_endpoint(struct pci_dev *pcidev, u32 *guids)
+{
+       struct telem_endpoint *ep;
+       unsigned int i;
+
+       for (i = 0; guids[i]; i++) {
+               ep = pmt_telem_find_and_register_endpoint(pcidev, guids[i], 0);
+               if (!IS_ERR(ep))
+                       return ep;
+       }
+       return ERR_PTR(-ENODEV);
+}
+
+void pmc_core_punit_pmt_init(struct pmc_dev *pmcdev, u32 *guids)
 {
        struct telem_endpoint *ep;
        struct pci_dev *pcidev;
@@ -1292,7 +1306,7 @@ void pmc_core_punit_pmt_init(struct pmc_dev *pmcdev, u32 guid)
                return;
        }
 
-       ep = pmt_telem_find_and_register_endpoint(pcidev, guid, 0);
+       ep = pmc_core_register_endpoint(pcidev, guids);
        pci_dev_put(pcidev);
        if (IS_ERR(ep)) {
                dev_err(&pmcdev->pdev->dev,
@@ -1689,8 +1703,8 @@ int generic_core_init(struct pmc_dev *pmcdev, struct pmc_dev_info *pmc_dev_info)
        }
 
        pmc_core_get_low_power_modes(pmcdev);
-       if (pmc_dev_info->dmu_guid)
-               pmc_core_punit_pmt_init(pmcdev, pmc_dev_info->dmu_guid);
+       if (pmc_dev_info->dmu_guids)
+               pmc_core_punit_pmt_init(pmcdev, pmc_dev_info->dmu_guids);
 
        if (ssram) {
                ret = pmc_core_get_telem_info(pmcdev, pmc_dev_info);

diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
index d6818bd34768ec9e7977d3958759c3cb125a6052..83d6e2e833785fcab20c118db9ed0a726c2529d2 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.h
+++ b/drivers/platform/x86/intel/pmc/core.h
@@ -481,7 +481,7 @@ enum pmc_index {
 /**
  * struct pmc_dev_info - Structure to keep PMC device info
  * @pci_func:          Function number of the primary PMC
- * @dmu_guid:          Die Management Unit GUID
+ * @dmu_guids:         List of Die Management Unit GUID
  * @regmap_list:       Pointer to a list of pmc_info structure that could be
  *                     available for the platform. When set, this field implies
  *                     SSRAM support.
@@ -495,7 +495,7 @@ enum pmc_index {
  */
 struct pmc_dev_info {
        u8 pci_func;
-       u32 dmu_guid;
+       u32 *dmu_guids;
        struct pmc_info *regmap_list;
        const struct pmc_reg_map *map;
        const struct file_operations *sub_req_show;
@@ -532,7 +532,7 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore);
 int pmc_core_resume_common(struct pmc_dev *pmcdev);
 int get_primary_reg_base(struct pmc *pmc);
 void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev);
-void pmc_core_punit_pmt_init(struct pmc_dev *pmcdev, u32 guid);
+void pmc_core_punit_pmt_init(struct pmc_dev *pmcdev, u32 *guids);
 void pmc_core_set_device_d3(unsigned int device);
 
 int generic_core_init(struct pmc_dev *pmcdev, struct pmc_dev_info *pmc_dev_info);

diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index 0b87e10f864e6f0c1b1ad6a3d19eae80f100cb92..19470ca311cf7298347a38a877e3ba67696ea68b 100644 (file)
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -992,9 +992,10 @@ static int mtl_core_init(struct pmc_dev *pmcdev, struct pmc_dev_info *pmc_dev_in
        return generic_core_init(pmcdev, pmc_dev_info);
 }
 
+static u32 MTL_PMT_DMU_GUIDS[] = {MTL_PMT_DMU_GUID, 0x0};
 struct pmc_dev_info mtl_pmc_dev = {
        .pci_func = 2,
-       .dmu_guid = MTL_PMT_DMU_GUID,
+       .dmu_guids = MTL_PMT_DMU_GUIDS,
        .regmap_list = mtl_pmc_info_list,
        .map = &mtl_socm_reg_map,
        .sub_req_show = &pmc_core_substate_req_regs_fops,