From: "David E. Box" <david.e.box@linux.intel.com>
To: linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
ilpo.jarvinen@linux.intel.com, rajvi.jingar@linux.intel.com
Subject: [PATCH V5 14/20] platform/x86/intel/pmc/mtl: Use return value from pmc_core_ssram_init()
Date: Wed, 22 Nov 2023 20:03:49 -0800 [thread overview]
Message-ID: <20231123040355.82139-15-david.e.box@linux.intel.com> (raw)
In-Reply-To: <20231123040355.82139-1-david.e.box@linux.intel.com>
Instead of checking for a NULL regbase, use the return value from
pmc_core_ssram_init() to check if PMC discovery was successful. If not, use
the legacy enumeration method (which only works for the primary PMC).
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
V5 - New patch. Split from previous.
drivers/platform/x86/intel/pmc/mtl.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index c3b5f4fe01d1..d1d3d33fb4b8 100644
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -990,12 +990,16 @@ int mtl_core_init(struct pmc_dev *pmcdev)
mtl_d3_fixup();
pmcdev->resume = mtl_resume;
-
pmcdev->regmap_list = mtl_pmc_info_list;
- pmc_core_ssram_init(pmcdev);
- /* If regbase not assigned, set map and discover using legacy method */
- if (!pmc->regbase) {
+ /*
+ * If ssram init fails use legacy method to at least get the
+ * primary PMC
+ */
+ ret = pmc_core_ssram_init(pmcdev);
+ if (ret) {
+ dev_warn(&pmcdev->pdev->dev,
+ "ssram init failed, %d, using legacy init\n", ret);
pmc->map = &mtl_socm_reg_map;
ret = get_primary_reg_base(pmc);
if (ret)
--
2.34.1
next prev parent reply other threads:[~2023-11-23 4:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-23 4:03 [PATCH V5 00/20] intel_pmc: Add telemetry API to read counters David E. Box
2023-11-23 4:03 ` [PATCH V5 01/20] platform/x86/intel/vsec: Fix xa_alloc memory leak David E. Box
2023-11-23 11:27 ` Ilpo Järvinen
2023-11-23 15:27 ` Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 02/20] platform/x86/intel/vsec: Move structures to header David E. Box
2023-11-23 4:03 ` [PATCH V5 03/20] platform/x86/intel/vsec: remove platform_info from vsec device structure David E. Box
2023-11-23 4:03 ` [PATCH V5 04/20] platform/x86/intel/vsec: Use cleanup.h David E. Box
2023-11-23 4:03 ` [PATCH V5 05/20] platform/x86/intel/vsec: Assign auxdev parent by argument David E. Box
2023-11-23 11:29 ` Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 06/20] platform/x86/intel/vsec: Add intel_vsec_register David E. Box
2023-11-23 15:24 ` Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 07/20] platform/x86/intel/vsec: Add base address field David E. Box
2023-11-23 4:03 ` [PATCH V5 08/20] platform/x86/intel/pmt: Add header to struct intel_pmt_entry David E. Box
2023-11-23 4:03 ` [PATCH V5 09/20] platform/x86/intel/pmt: telemetry: Export API to read telemetry David E. Box
2023-11-23 4:03 ` [PATCH V5 10/20] platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init David E. Box
2023-11-23 4:03 ` [PATCH V5 11/20] platform/x86/intel/pmc: Allow pmc_core_ssram_init to fail David E. Box
2023-11-23 4:03 ` [PATCH V5 12/20] asm-generic/io.h: iounmap/ioport_unmap cleanup.h support David E. Box
2023-11-23 14:30 ` Ilpo Järvinen
2023-11-23 16:23 ` David E. Box
2023-11-28 1:55 ` David E. Box
2023-11-29 8:45 ` Baoquan He
2023-12-10 15:24 ` Baoquan He
2023-11-24 9:49 ` kernel test robot
2023-11-23 4:03 ` [PATCH V5 13/20] platform/x86/intel/pmc: Cleanup SSRAM discovery David E. Box
2023-11-23 14:26 ` Ilpo Järvinen
2023-11-23 4:03 ` David E. Box [this message]
2023-11-23 14:26 ` [PATCH V5 14/20] platform/x86/intel/pmc/mtl: Use return value from pmc_core_ssram_init() Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 15/20] platform/x86/intel/pmc: Find and register PMC telemetry entries David E. Box
2023-11-23 4:03 ` [PATCH V5 16/20] platform/x86/intel/pmc: Display LPM requirements for multiple PMCs David E. Box
2023-11-23 14:08 ` Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 17/20] platform/x86/intel/pmc: Retrieve LPM information using Intel PMT David E. Box
2023-11-23 4:03 ` [PATCH V5 18/20] platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P David E. Box
2023-11-23 4:03 ` [PATCH V5 19/20] platform/x86/intel/pmc: Add debug attribute for Die C6 counter David E. Box
2023-11-23 11:38 ` Ilpo Järvinen
2023-11-23 13:39 ` Ilpo Järvinen
2023-11-23 4:03 ` [PATCH V5 20/20] platform/x86/intel/pmc: Show Die C6 counter on Meteor Lake David E. Box
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=20231123040355.82139-15-david.e.box@linux.intel.com \
--to=david.e.box@linux.intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rajvi.jingar@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).