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 command 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 <[email protected]>
Reviewed-by: Raul E Rangel <[email protected]>
Signed-off-by: Tim Van Patten <[email protected]>
---
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 68bba0fcafab3..93820654a555b 100644
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -543,23 +543,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.40.1.606.ga4b1b128d6-goog
On Fri, May 12, 2023 at 11:35:57AM -0600, Tim Van Patten 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 command that the AP sends and allows the EC to log entry/exit of
> AP's suspend/resume more accurately.
This is an old series. It should preserve the version number and change logs
(at least until v8[5]).
Went through the series again, and put all concerns together:
* Should it print more logs during suspend/resume? See v1[1].
* Which is more like local patches for debugging some specific issues.
* Should it move the callbacks? See v2[2].
* Is it appropriate to call cros_ec_suspend() when PM is still in prepare
phase and call cros_ec_resume() when PM is already in complete phase?
* Should it print return value of cros_ec_resume()? See v3[3] and v7[4].
* By referencing other use cases, they just defer it to PM.
[1]: https://patchwork.kernel.org/project/chrome-platform/patch/20220701095421.1.I78ded92e416b55de31975686d34b2058d4761c07@changeid/
[2]: https://patchwork.kernel.org/project/chrome-platform/patch/20220706205136.v2.1.Ic7a7c81f880ab31533652e0928aa6e687bb268b5@changeid/
[3]: https://patchwork.kernel.org/project/chrome-platform/patch/20220802113957.v3.1.I2c8c550183162e7594309b66d19af696b8d84552@changeid/
[4]: https://patchwork.kernel.org/project/chrome-platform/patch/20220823095915.v7.1.I55189adfdb8d025fc991a0fa820ec09078619b15@changeid/
[5]: https://patchwork.kernel.org/project/chrome-platform/patch/20221028171820.v8.1.I55189adfdb8d025fc991a0fa820ec09078619b15@changeid/
> Signed-off-by: Tim Van Patten <[email protected]>
> Reviewed-by: Raul E Rangel <[email protected]>
> Signed-off-by: Tim Van Patten <[email protected]>
It shouldn't need duplicate S-o-b.