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

platform/x86/intel/pmc: Add resume callback 



Add a resume callback to perform platform specific functions during resume
from suspend.

Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20230607233849.239047-1-david.e.box@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent f999e23c

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

+12 −2
Original line number Diff line number Diff line
@@ -1222,11 +1222,11 @@ static inline bool pmc_core_is_s0ix_failed(struct pmc_dev *pmcdev) 
	return false;

}



static __maybe_unused int pmc_core_resume(struct device *dev)

int pmc_core_resume_common(struct pmc_dev *pmcdev)

{

	struct pmc_dev *pmcdev = dev_get_drvdata(dev);

	const struct pmc_bit_map **maps = pmcdev->map->lpm_sts;

	int offset = pmcdev->map->lpm_status_offset;

	struct device *dev = &pmcdev->pdev->dev;



	/* Check if the syspend used S0ix */

	if (pm_suspend_via_firmware())
@@ -1256,6 +1256,16 @@ static __maybe_unused int pmc_core_resume(struct device *dev) 
	return 0;

}



static __maybe_unused int pmc_core_resume(struct device *dev)

{

	struct pmc_dev *pmcdev = dev_get_drvdata(dev);



	if (pmcdev->resume)

		return pmcdev->resume(pmcdev);



	return pmc_core_resume_common(pmcdev);

}



static const struct dev_pm_ops pmc_core_pm_ops = {

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pmc_core_suspend, pmc_core_resume)

};

drivers/platform/x86/intel/pmc/core.h

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ struct pmc_reg_map { 
 * @lpm_en_modes:	Array of enabled modes from lowest to highest priority

 * @lpm_req_regs:	List of substate requirements

 * @core_configure:	Function pointer to configure the platform

 * @resume:		Function to perform platform specific resume

 *

 * pmc_dev contains info about power management controller device.

 */
@@ -345,6 +346,7 @@ struct pmc_dev { 
	int lpm_en_modes[LPM_MAX_NUM_MODES];

	u32 *lpm_req_regs;

	void (*core_configure)(struct pmc_dev *pmcdev);

	int (*resume)(struct pmc_dev *pmcdev);

};



extern const struct pmc_bit_map msr_map[];
@@ -398,6 +400,7 @@ extern const struct pmc_reg_map mtl_reg_map; 
extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev);

extern int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value);



int pmc_core_resume_common(struct pmc_dev *pmcdev);

void spt_core_init(struct pmc_dev *pmcdev);

void cnp_core_init(struct pmc_dev *pmcdev);

void icl_core_init(struct pmc_dev *pmcdev);