Skip to content

Commit 095fc30

Browse files
Winkler, TomasJarkko Sakkinen
authored andcommitted
tpm/tpm_crb: enter the low power state upon device suspend
This fix enables a platform to enter the idle state (suspend-to-idle) The driver needs to request explicitly go_idle upon completion from the pm suspend handler. The runtime pm is disabled on suspend during prepare state by calling pm_runtime_get_noresume, hence we cannot relay on runtime pm to leave the device in low power state. Symmetrically cmdReady is called upon resume. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Siged-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
1 parent 4bf4b4e commit 095fc30

1 file changed

Lines changed: 24 additions & 1 deletion

File tree

drivers/char/tpm/tpm_crb.c

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,33 @@ static int crb_pm_runtime_resume(struct device *dev)
502502

503503
return crb_cmd_ready(dev, priv);
504504
}
505+
506+
static int crb_pm_suspend(struct device *dev)
507+
{
508+
int ret;
509+
510+
ret = tpm_pm_suspend(dev);
511+
if (ret)
512+
return ret;
513+
514+
return crb_pm_runtime_suspend(dev);
515+
}
516+
517+
static int crb_pm_resume(struct device *dev)
518+
{
519+
int ret;
520+
521+
ret = crb_pm_runtime_resume(dev);
522+
if (ret)
523+
return ret;
524+
525+
return tpm_pm_resume(dev);
526+
}
527+
505528
#endif /* CONFIG_PM */
506529

507530
static const struct dev_pm_ops crb_pm = {
508-
SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume)
531+
SET_SYSTEM_SLEEP_PM_OPS(crb_pm_suspend, crb_pm_resume)
509532
SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL)
510533
};
511534

0 commit comments

Comments
 (0)