mfd: cros_ec: Send correct suspend/resume event to EC (9c576bd3) · Commits · 戴 / test

pm_suspend_via_firmware() will return false for platforms with ACPI disabled and ACPI is a prerequisite for S0ix support. With this patch, sleep state event sent to EC is forced to S3 if ACPI is disabled. Signed-off-by:

Shawn Nematbakhsh <shawnn@chromium.org> Signed-off-by:

Thierry Escande <thierry.escande@collabora.com> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/cros_ec.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -190,7 +190,8 @@ int cros_ec_suspend(struct cros_ec_device *ec_dev)
		int ret;
		u8 sleep_event;

		sleep_event = pm_suspend_via_firmware() ? HOST_SLEEP_EVENT_S3_RESUME :
		sleep_event = (!IS_ENABLED(CONFIG_ACPI) \|\| pm_suspend_via_firmware()) ?
		HOST_SLEEP_EVENT_S3_RESUME :
		HOST_SLEEP_EVENT_S0IX_RESUME;

		ret = cros_ec_sleep_event(ec_dev, sleep_event);
		@@ -224,7 +225,8 @@ int cros_ec_resume(struct cros_ec_device *ec_dev)
		ec_dev->suspended = false;
		enable_irq(ec_dev->irq);

		sleep_event = pm_suspend_via_firmware() ? HOST_SLEEP_EVENT_S3_RESUME :
		sleep_event = (!IS_ENABLED(CONFIG_ACPI) \|\| pm_suspend_via_firmware()) ?
		HOST_SLEEP_EVENT_S3_RESUME :
		HOST_SLEEP_EVENT_S0IX_RESUME;

		ret = cros_ec_sleep_event(ec_dev, sleep_event);

Admin message