From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751070AbdAWLwM (ORCPT ); Mon, 23 Jan 2017 06:52:12 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35322 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750726AbdAWLwL (ORCPT ); Mon, 23 Jan 2017 06:52:11 -0500 Date: Mon, 23 Jan 2017 11:56:10 +0000 From: Lee Jones To: Thierry Escande Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH] mfd: cros_ec: Send correct suspend/resume event to EC Message-ID: <20170123115610.GG16020@dell> References: <1484319872-26816-1-git-send-email-thierry.escande@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1484319872-26816-1-git-send-email-thierry.escande@collabora.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 13 Jan 2017, Thierry Escande wrote: > From: Shawn Nematbakhsh > > 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 > Signed-off-by: Thierry Escande > --- > 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