Commit 642dd26f authored by David E. Box's avatar David E. Box Committed by Hans de Goede
Browse files

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: default avatarDavid E. Box <david.e.box@linux.intel.com>
Reviewed-by: default avatarIlpo 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: default avatarHans de Goede <hdegoede@redhat.com>
parent a01486dc

drivers/platform/x86/intel/pmc/mtl.c

+8 −4
Original line number Diff line number Diff line
@@ -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)