[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20231219042216.2592029-6-rajvi.jingar@linux.intel.com>
Date: Mon, 18 Dec 2023 20:22:14 -0800
From: rjingar <rajvi.jingar@...ux.intel.com>
To: irenic.rajneesh@...il.com,
david.e.box@...el.com,
hdegoede@...hat.com,
ilpo.jarvinen@...ux.intel.com,
platform-driver-x86@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: rajvi.jingar@...ux.intel.com
Subject: [PATCH 6/8] platform/x86/intel/pmc: Add ssram_init flag in PMC discovery in Meteor Lake
From: Rajvi Jingar <rajvi.jingar@...ux.intel.com>
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@...ux.intel.com>
---
drivers/platform/x86/intel/pmc/mtl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index d2470f800298..e75431325dda 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;
}
--
2.34.1
Powered by blists - more mailing lists