* [PATCH] mfd: cros_ec: Send correct suspend/resume event to EC
@ 2017-01-13 15:04 Thierry Escande
2017-01-23 11:56 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Thierry Escande @ 2017-01-13 15:04 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel
From: Shawn Nematbakhsh <shawnn@chromium.org>
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>
---
drivers/mfd/cros_ec.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index b8a5080..9b66a98 100644
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -190,8 +190,9 @@ 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 :
- HOST_SLEEP_EVENT_S0IX_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);
if (ret < 0)
@@ -224,8 +225,9 @@ 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 :
- HOST_SLEEP_EVENT_S0IX_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);
if (ret < 0)
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: cros_ec: Send correct suspend/resume event to EC
2017-01-13 15:04 [PATCH] mfd: cros_ec: Send correct suspend/resume event to EC Thierry Escande
@ 2017-01-23 11:56 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2017-01-23 11:56 UTC (permalink / raw)
To: Thierry Escande; +Cc: linux-kernel
On Fri, 13 Jan 2017, Thierry Escande wrote:
> From: Shawn Nematbakhsh <shawnn@chromium.org>
>
> 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>
> ---
> drivers/mfd/cros_ec.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
> index b8a5080..9b66a98 100644
> --- a/drivers/mfd/cros_ec.c
> +++ b/drivers/mfd/cros_ec.c
> @@ -190,8 +190,9 @@ 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 :
> - HOST_SLEEP_EVENT_S0IX_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);
> if (ret < 0)
> @@ -224,8 +225,9 @@ 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 :
> - HOST_SLEEP_EVENT_S0IX_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);
> if (ret < 0)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-23 11:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-13 15:04 [PATCH] mfd: cros_ec: Send correct suspend/resume event to EC Thierry Escande
2017-01-23 11:56 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).