diff options
| author |  David E. Box <david.e.box@linux.intel.com>
| 2023-11-29 14:21:26 -0800 |
|---|---|---|
| committer |  Hans de Goede <hdegoede@redhat.com>
| 2023-12-04 14:53:43 +0100 |
| commit | 642dd26f58d91f4bb2e2fcaaf178bbc35369b73a (patch) | |
| tree | fd191689d731876c9770799b33cc84b586f0a634 /drivers/platform/x86/intel | |
| parent | platform/x86/intel/pmc: Cleanup SSRAM discovery (diff) | |
| download | linux-642dd26f58d91f4bb2e2fcaaf178bbc35369b73a.tar.gz linux-642dd26f58d91f4bb2e2fcaaf178bbc35369b73a.tar.bz2 linux-642dd26f58d91f4bb2e2fcaaf178bbc35369b73a.zip | |
platform/x86/intel/pmc/mtl: Use return value from pmc_core_ssram_init()
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>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129222132.2331261-15-david.e.box@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform/x86/intel')
| -rw-r--r-- | drivers/platform/x86/intel/pmc/mtl.c | 12 |
1 files 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) |