aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorRajvi Jingar <rajvi.jingar@linux.intel.com>2023-12-18 20:22:14 -0800
committerHans de Goede <hdegoede@redhat.com>2023-12-19 16:48:27 +0100
commit1d62ada48d41d72d72232585eed0f3e1136ae1fb (patch)
tree7906bb1abd345398044a1801375b76791cb24d9f /drivers/platform
parentd79c3c82ee82cc99ffde4c4f5fe69db35bcfb733 (diff)
downloadlinux-1d62ada48d41d72d72232585eed0f3e1136ae1fb.tar.gz
platform/x86/intel/pmc: Add ssram_init flag in PMC discovery in Meteor Lake
If PMC discovery using pmc_core_ssram_init() was unsuccessful for the Meteor Lake platform, the legacy enumeration method is used. In this case pci device struct for the PMC SSRAM is not available and pmc_core_ssram_get_lpm_reqs() will not work. Add ssram_init flag to indicate if the PMC SSRAM initialization was successful or not. Call pmc_core_ssram_get_lpm_reqs() only if the ssram_init flag is set to true. Signed-off-by: Rajvi Jingar <rajvi.jingar@linux.intel.com> Link: https://lore.kernel.org/r/20231219042216.2592029-6-rajvi.jingar@linux.intel.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel/pmc/mtl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index d2470f8002981..e75431325dda9 100644
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -994,6 +994,7 @@ int mtl_core_init(struct pmc_dev *pmcdev)
struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC];
int ret;
int func = 2;
+ bool ssram_init = true;
mtl_d3_fixup();
@@ -1006,6 +1007,7 @@ int mtl_core_init(struct pmc_dev *pmcdev)
*/
ret = pmc_core_ssram_init(pmcdev, func);
if (ret) {
+ ssram_init = false;
dev_warn(&pmcdev->pdev->dev,
"ssram init failed, %d, using legacy init\n", ret);
pmc->map = &mtl_socm_reg_map;
@@ -1023,5 +1025,8 @@ int mtl_core_init(struct pmc_dev *pmcdev)
dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");
pmc_core_send_ltr_ignore(pmcdev, 3);
- return pmc_core_ssram_get_lpm_reqs(pmcdev);
+ if (ssram_init)
+ return pmc_core_ssram_get_lpm_reqs(pmcdev);
+
+ return 0;
}