| Message ID | 20220822112832.v6.1.I55189adfdb8d025fc991a0fa820ec09078619b15@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6] platform/chrome: cros_ec_lpc: Move host event to prepare/complete | expand |
Sorry for the double email, I forgot to set my original reply to plain text. On Mon, Aug 22, 2022 at 11:28 AM Tim Van Patten <timvp@google.com> wrote: > > Update cros_ec_lpc_pm_ops to call cros_ec_lpc_prepare() during PM > .prepare() and cros_ec_lpc_complete() during .complete(). This moves the > host event that the AP sends and allows the EC to log entry/exit of AP's > suspend/resume more accurately. > > Signed-off-by: Tim Van Patten <timvp@google.com> > --- > > Changes in v6: > - Fully restore fixes from v3. > > Changes in v5: > - Restore fixes from v3. > > Changes in v4: > - Update title and description. > > Changes in v3: > - Update cros_ec_lpc_suspend() to cros_ec_lpc_prepare() > - Update cros_ec_lpc_resume() to cros_ec_lpc_complete() > > Changes in v2: > - Include cros_ec_resume() return value in dev_info() output. > - Guard setting .prepare/.complete with #ifdef CONFIG_PM_SLEEP. > > drivers/platform/chrome/cros_ec_lpc.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c > index 7677ab3c0ead..4158bdeee197 100644 > --- a/drivers/platform/chrome/cros_ec_lpc.c > +++ b/drivers/platform/chrome/cros_ec_lpc.c > @@ -530,23 +530,31 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = { > MODULE_DEVICE_TABLE(dmi, cros_ec_lpc_dmi_table); > > #ifdef CONFIG_PM_SLEEP > -static int cros_ec_lpc_suspend(struct device *dev) > +static int cros_ec_lpc_prepare(struct device *dev) > { > struct cros_ec_device *ec_dev = dev_get_drvdata(dev); > > + dev_info(dev, "Prepare EC suspend\n"); > + > return cros_ec_suspend(ec_dev); > } > > -static int cros_ec_lpc_resume(struct device *dev) > +static void cros_ec_lpc_complete(struct device *dev) > { > struct cros_ec_device *ec_dev = dev_get_drvdata(dev); > + int ret; > + > + ret = cros_ec_resume(ec_dev); > > - return cros_ec_resume(ec_dev); > + dev_info(dev, "EC resume completed: ret = %d\n", ret); > } > #endif > > static const struct dev_pm_ops cros_ec_lpc_pm_ops = { > - SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume) > +#ifdef CONFIG_PM_SLEEP > + .prepare = cros_ec_lpc_prepare, > + .complete = cros_ec_lpc_complete > +#endif > }; > > static struct platform_driver cros_ec_lpc_driver = { > -- > 2.37.2.609.g9ff673ca1a-goog > Reviewed-by: Raul E Rangel <rrangel@chromium.org>
diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c index 7677ab3c0ead..4158bdeee197 100644 --- a/drivers/platform/chrome/cros_ec_lpc.c +++ b/drivers/platform/chrome/cros_ec_lpc.c @@ -530,23 +530,31 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = { MODULE_DEVICE_TABLE(dmi, cros_ec_lpc_dmi_table); #ifdef CONFIG_PM_SLEEP -static int cros_ec_lpc_suspend(struct device *dev) +static int cros_ec_lpc_prepare(struct device *dev) { struct cros_ec_device *ec_dev = dev_get_drvdata(dev); + dev_info(dev, "Prepare EC suspend\n"); + return cros_ec_suspend(ec_dev); } -static int cros_ec_lpc_resume(struct device *dev) +static void cros_ec_lpc_complete(struct device *dev) { struct cros_ec_device *ec_dev = dev_get_drvdata(dev); + int ret; + + ret = cros_ec_resume(ec_dev); - return cros_ec_resume(ec_dev); + dev_info(dev, "EC resume completed: ret = %d\n", ret); } #endif static const struct dev_pm_ops cros_ec_lpc_pm_ops = { - SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume) +#ifdef CONFIG_PM_SLEEP + .prepare = cros_ec_lpc_prepare, + .complete = cros_ec_lpc_complete +#endif }; static struct platform_driver cros_ec_lpc_driver = {
Update cros_ec_lpc_pm_ops to call cros_ec_lpc_prepare() during PM .prepare() and cros_ec_lpc_complete() during .complete(). This moves the host event that the AP sends and allows the EC to log entry/exit of AP's suspend/resume more accurately. Signed-off-by: Tim Van Patten <timvp@google.com> --- Changes in v6: - Fully restore fixes from v3. Changes in v5: - Restore fixes from v3. Changes in v4: - Update title and description. Changes in v3: - Update cros_ec_lpc_suspend() to cros_ec_lpc_prepare() - Update cros_ec_lpc_resume() to cros_ec_lpc_complete() Changes in v2: - Include cros_ec_resume() return value in dev_info() output. - Guard setting .prepare/.complete with #ifdef CONFIG_PM_SLEEP. drivers/platform/chrome/cros_ec_lpc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)