From: rjingar <rajvi.jingar@linux.intel.com>
To: irenic.rajneesh@gmail.com, david.e.box@intel.com,
hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: rajvi.jingar@linux.intel.com
Subject: [PATCH 6/8] platform/x86/intel/pmc: Add ssram_init flag in PMC discovery in Meteor Lake
Date: Mon, 18 Dec 2023 20:22:14 -0800 [thread overview]
Message-ID: <20231219042216.2592029-6-rajvi.jingar@linux.intel.com> (raw)
In-Reply-To: <20231219042216.2592029-1-rajvi.jingar@linux.intel.com>
From: Rajvi Jingar <rajvi.jingar@linux.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@linux.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
next prev parent reply other threads:[~2023-12-19 4:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 4:22 [PATCH 1/8] platform/x86/intel/pmc: Fix in mtl_punit_pmt_init() rjingar
2023-12-19 4:22 ` [PATCH 2/8] platform/x86/intel/pmc: Add PSON residency counter rjingar
2023-12-19 4:22 ` [PATCH 3/8] platform/x86/intel/pmc: Add regmap for Tiger Lake H PCH rjingar
2023-12-19 4:22 ` [PATCH 4/8] platform/x86/intel/pmc: Add PSON residency counter for Alder Lake rjingar
2023-12-19 4:22 ` [PATCH 5/8] platform/x86/intel/pmc: Move common code to core.c rjingar
2023-12-19 4:22 ` rjingar [this message]
2023-12-19 4:22 ` [PATCH 7/8] platform/x86/intel/pmc: Add Arrow Lake S support to intel_pmc_core driver rjingar
2023-12-19 4:22 ` [PATCH 8/8] platform/x86/intel/pmc: Add Lunar Lake M " rjingar
2023-12-19 15:49 ` [PATCH 1/8] platform/x86/intel/pmc: Fix in mtl_punit_pmt_init() Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231219042216.2592029-6-rajvi.jingar@linux.intel.com \
--to=rajvi.jingar@linux.intel.com \
--cc=david.e.box@intel.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=irenic.rajneesh@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®