[PATCH] ACPI: do not fail suspend if unable to configure wakeup

[PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

Newer kernels put i2c devices with ACPI companion in ACPI power domain and
then ACPI will try to configure them for wakeup (if requested).
Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
completely separate device (which is handled by the kernel as a sleep
button), leaving the touchpads themselves not wakeup capable (as far as
ACPI is concerned). This causes ACPI late suspend code to fail to configure
them as wakeup sources and aborts entire suspend.

To work around this issues let's not abort entire suspend process if
driver asked to be a wakeup source but ACPI can not satisfy that
request.

Note that originally I tried to simply change the driver to not mark
device as wakeup source, unfortunately then we do not know that we
should not be powering down the device completely, otherwise we can't
wake up.

Verified by making sure that "echo mem > /sys/power/state" works on
Squawks.

Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---
 drivers/acpi/device_pm.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 67075f8..440bc3d 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
 	struct acpi_device *adev = ACPI_COMPANION(dev);
 	u32 target_state;
 	bool wakeup;
+	bool can_wakeup;
 	int error;
 
 	if (!adev)
@@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
 
 	target_state = acpi_target_system_state();
 	wakeup = device_may_wakeup(dev);
-	error = acpi_device_wakeup(adev, target_state, wakeup);
-	if (wakeup && error)
-		return error;
+	can_wakeup = acpi_device_can_wakeup(adev);
+
+	if (can_wakeup) {
+		error = acpi_device_wakeup(adev, target_state, wakeup);
+		if (wakeup && error)
+			return error;
+	} else if (wakeup) {
+		dev_warn(dev,
+			 "device is not wakeup-capable, not enabling wakeup\n");
+	}
 
 	error = acpi_dev_pm_low_power(dev, adev, target_state);
-	if (error)
+	if (error && can_wakeup)
 		acpi_device_wakeup(adev, ACPI_STATE_UNKNOWN, false);
 
 	return error;
-- 
2.1.0.rc2.206.gedb03e5


-- 
Dmitry

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Rafael J. Wysocki]

Hi,

On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> Newer kernels put i2c devices with ACPI companion in ACPI power domain and
> then ACPI will try to configure them for wakeup (if requested).
> Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
> completely separate device (which is handled by the kernel as a sleep
> button), leaving the touchpads themselves not wakeup capable (as far as
> ACPI is concerned). This causes ACPI late suspend code to fail to configure
> them as wakeup sources and aborts entire suspend.
>
> To work around this issues let's not abort entire suspend process if
> driver asked to be a wakeup source but ACPI can not satisfy that
> request.
>
> Note that originally I tried to simply change the driver to not mark
> device as wakeup source, unfortunately then we do not know that we
> should not be powering down the device completely, otherwise we can't
> wake up.
>
> Verified by making sure that "echo mem > /sys/power/state" works on
> Squawks.
>
> Reviewed-by: Benson Leung <bleung@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
>  drivers/acpi/device_pm.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> index 67075f8..440bc3d 100644
> --- a/drivers/acpi/device_pm.c
> +++ b/drivers/acpi/device_pm.c
> @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
>         struct acpi_device *adev = ACPI_COMPANION(dev);
>         u32 target_state;
>         bool wakeup;
> +       bool can_wakeup;
>         int error;
>
>         if (!adev)
> @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
>
>         target_state = acpi_target_system_state();
>         wakeup = device_may_wakeup(dev);
> -       error = acpi_device_wakeup(adev, target_state, wakeup);
> -       if (wakeup && error)
> -               return error;
> +       can_wakeup = acpi_device_can_wakeup(adev);
> +
> +       if (can_wakeup) {
> +               error = acpi_device_wakeup(adev, target_state, wakeup);
> +               if (wakeup && error)
> +                       return error;
> +       } else if (wakeup) {

I think we just need to return an error code in that case, because otherwise
this is potentially dangerous (worst case, it may be impossible to wake up
the machine at all after that).

> +               dev_warn(dev,
> +                        "device is not wakeup-capable, not enabling wakeup\n");
> +       }
>
>         error = acpi_dev_pm_low_power(dev, adev, target_state);
> -       if (error)
> +       if (error && can_wakeup)
>                 acpi_device_wakeup(adev, ACPI_STATE_UNKNOWN, false);
>
>         return error;
> --

Rafael

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

Hi Rafael,

On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
> Hi,
> 
> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
> > then ACPI will try to configure them for wakeup (if requested).
> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
> > completely separate device (which is handled by the kernel as a sleep
> > button), leaving the touchpads themselves not wakeup capable (as far as
> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
> > them as wakeup sources and aborts entire suspend.
> >
> > To work around this issues let's not abort entire suspend process if
> > driver asked to be a wakeup source but ACPI can not satisfy that
> > request.
> >
> > Note that originally I tried to simply change the driver to not mark
> > device as wakeup source, unfortunately then we do not know that we
> > should not be powering down the device completely, otherwise we can't
> > wake up.
> >
> > Verified by making sure that "echo mem > /sys/power/state" works on
> > Squawks.
> >
> > Reviewed-by: Benson Leung <bleung@chromium.org>
> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> > ---
> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
> >  1 file changed, 12 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> > index 67075f8..440bc3d 100644
> > --- a/drivers/acpi/device_pm.c
> > +++ b/drivers/acpi/device_pm.c
> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
> >         struct acpi_device *adev = ACPI_COMPANION(dev);
> >         u32 target_state;
> >         bool wakeup;
> > +       bool can_wakeup;
> >         int error;
> >
> >         if (!adev)
> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
> >
> >         target_state = acpi_target_system_state();
> >         wakeup = device_may_wakeup(dev);
> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
> > -       if (wakeup && error)
> > -               return error;
> > +       can_wakeup = acpi_device_can_wakeup(adev);
> > +
> > +       if (can_wakeup) {
> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
> > +               if (wakeup && error)
> > +                       return error;
> > +       } else if (wakeup) {
> 
> I think we just need to return an error code in that case, because otherwise

We used to return error and that error aborted the suspend altogether,
which prompted creating this patch.

> this is potentially dangerous (worst case, it may be impossible to wake up
> the machine at all after that).

Yes, there is such potential, but that kind of error (no working wakeup
sources) will be discovered before a box is shipped. Right now we have
boxes in the wild that suspend fine with 3.10 and refuse to suspend with
3.14 because between 3.10 and 3.14 we started placing i2c devices with
ACPI companions into ACPI power domain and ACPI power domain is now
trying to configure them as wakeup sources and fails.

Thanks.

-- 
Dmitry

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

Hi Rafael,

On Thu, Oct 16, 2014 at 9:05 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> Hi Rafael,
>
> On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
>> Hi,
>>
>> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
>> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
>> > then ACPI will try to configure them for wakeup (if requested).
>> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
>> > completely separate device (which is handled by the kernel as a sleep
>> > button), leaving the touchpads themselves not wakeup capable (as far as
>> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
>> > them as wakeup sources and aborts entire suspend.
>> >
>> > To work around this issues let's not abort entire suspend process if
>> > driver asked to be a wakeup source but ACPI can not satisfy that
>> > request.
>> >
>> > Note that originally I tried to simply change the driver to not mark
>> > device as wakeup source, unfortunately then we do not know that we
>> > should not be powering down the device completely, otherwise we can't
>> > wake up.
>> >
>> > Verified by making sure that "echo mem > /sys/power/state" works on
>> > Squawks.
>> >
>> > Reviewed-by: Benson Leung <bleung@chromium.org>
>> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
>> > ---
>> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
>> >  1 file changed, 12 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
>> > index 67075f8..440bc3d 100644
>> > --- a/drivers/acpi/device_pm.c
>> > +++ b/drivers/acpi/device_pm.c
>> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
>> >         struct acpi_device *adev = ACPI_COMPANION(dev);
>> >         u32 target_state;
>> >         bool wakeup;
>> > +       bool can_wakeup;
>> >         int error;
>> >
>> >         if (!adev)
>> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
>> >
>> >         target_state = acpi_target_system_state();
>> >         wakeup = device_may_wakeup(dev);
>> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
>> > -       if (wakeup && error)
>> > -               return error;
>> > +       can_wakeup = acpi_device_can_wakeup(adev);
>> > +
>> > +       if (can_wakeup) {
>> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
>> > +               if (wakeup && error)
>> > +                       return error;
>> > +       } else if (wakeup) {
>>
>> I think we just need to return an error code in that case, because otherwise
>
> We used to return error and that error aborted the suspend altogether,
> which prompted creating this patch.
>
>> this is potentially dangerous (worst case, it may be impossible to wake up
>> the machine at all after that).
>
> Yes, there is such potential, but that kind of error (no working wakeup
> sources) will be discovered before a box is shipped. Right now we have
> boxes in the wild that suspend fine with 3.10 and refuse to suspend with
> 3.14 because between 3.10 and 3.14 we started placing i2c devices with
> ACPI companions into ACPI power domain and ACPI power domain is now
> trying to configure them as wakeup sources and fails.

A gentle ping on the patch - without it (or something else) we basically
have a regression on shipped hardware: Chromebooks that were
suspending fine with 3.10 refuse to suspend with 3.14.

Thanks.

-- 
Dmitry

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Rafael J. Wysocki]

On Tuesday, November 18, 2014 10:00:53 AM Dmitry Torokhov wrote:
> Hi Rafael,
> 
> On Thu, Oct 16, 2014 at 9:05 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> > Hi Rafael,
> >
> > On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
> >> Hi,
> >>
> >> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> >> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
> >> > then ACPI will try to configure them for wakeup (if requested).
> >> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
> >> > completely separate device (which is handled by the kernel as a sleep
> >> > button), leaving the touchpads themselves not wakeup capable (as far as
> >> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
> >> > them as wakeup sources and aborts entire suspend.
> >> >
> >> > To work around this issues let's not abort entire suspend process if
> >> > driver asked to be a wakeup source but ACPI can not satisfy that
> >> > request.
> >> >
> >> > Note that originally I tried to simply change the driver to not mark
> >> > device as wakeup source, unfortunately then we do not know that we
> >> > should not be powering down the device completely, otherwise we can't
> >> > wake up.
> >> >
> >> > Verified by making sure that "echo mem > /sys/power/state" works on
> >> > Squawks.
> >> >
> >> > Reviewed-by: Benson Leung <bleung@chromium.org>
> >> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> >> > ---
> >> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
> >> >  1 file changed, 12 insertions(+), 4 deletions(-)
> >> >
> >> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> >> > index 67075f8..440bc3d 100644
> >> > --- a/drivers/acpi/device_pm.c
> >> > +++ b/drivers/acpi/device_pm.c
> >> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
> >> >         struct acpi_device *adev = ACPI_COMPANION(dev);
> >> >         u32 target_state;
> >> >         bool wakeup;
> >> > +       bool can_wakeup;
> >> >         int error;
> >> >
> >> >         if (!adev)
> >> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
> >> >
> >> >         target_state = acpi_target_system_state();
> >> >         wakeup = device_may_wakeup(dev);
> >> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
> >> > -       if (wakeup && error)
> >> > -               return error;
> >> > +       can_wakeup = acpi_device_can_wakeup(adev);
> >> > +
> >> > +       if (can_wakeup) {
> >> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
> >> > +               if (wakeup && error)
> >> > +                       return error;
> >> > +       } else if (wakeup) {
> >>
> >> I think we just need to return an error code in that case, because otherwise
> >
> > We used to return error and that error aborted the suspend altogether,
> > which prompted creating this patch.
> >
> >> this is potentially dangerous (worst case, it may be impossible to wake up
> >> the machine at all after that).
> >
> > Yes, there is such potential, but that kind of error (no working wakeup
> > sources) will be discovered before a box is shipped. Right now we have
> > boxes in the wild that suspend fine with 3.10 and refuse to suspend with
> > 3.14 because between 3.10 and 3.14 we started placing i2c devices with
> > ACPI companions into ACPI power domain and ACPI power domain is now
> > trying to configure them as wakeup sources and fails.
> 
> A gentle ping on the patch - without it (or something else) we basically
> have a regression on shipped hardware: Chromebooks that were
> suspending fine with 3.10 refuse to suspend with 3.14.

It fell of my radar, sorry about that.

So the error here is that device_may_wakeup(dev) returns true, because the
device is technically wakeup-capable, but the wakeup is not via ACPI?

I'd say this is rather not in accordance with the spec, but that means we
need to simply ignore 'wakeup' if acpi_device_can_wakeup(adev) returns false.

So what about the appended patch?

Rafael


---
 drivers/acpi/device_pm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
--- linux-pm.orig/drivers/acpi/device_pm.c
+++ linux-pm/drivers/acpi/device_pm.c
@@ -878,7 +878,7 @@ int acpi_dev_suspend_late(struct device
 		return 0;
 
 	target_state = acpi_target_system_state();
-	wakeup = device_may_wakeup(dev);
+	wakeup = device_may_wakeup(dev) && acpi_device_can_wakeup(adev);
 	error = acpi_device_wakeup(adev, target_state, wakeup);
 	if (wakeup && error)
 		return error;

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

On Tue, Nov 18, 2014 at 3:43 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> On Tuesday, November 18, 2014 10:00:53 AM Dmitry Torokhov wrote:
>> Hi Rafael,
>>
>> On Thu, Oct 16, 2014 at 9:05 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
>> > Hi Rafael,
>> >
>> > On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
>> >> Hi,
>> >>
>> >> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
>> >> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
>> >> > then ACPI will try to configure them for wakeup (if requested).
>> >> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
>> >> > completely separate device (which is handled by the kernel as a sleep
>> >> > button), leaving the touchpads themselves not wakeup capable (as far as
>> >> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
>> >> > them as wakeup sources and aborts entire suspend.
>> >> >
>> >> > To work around this issues let's not abort entire suspend process if
>> >> > driver asked to be a wakeup source but ACPI can not satisfy that
>> >> > request.
>> >> >
>> >> > Note that originally I tried to simply change the driver to not mark
>> >> > device as wakeup source, unfortunately then we do not know that we
>> >> > should not be powering down the device completely, otherwise we can't
>> >> > wake up.
>> >> >
>> >> > Verified by making sure that "echo mem > /sys/power/state" works on
>> >> > Squawks.
>> >> >
>> >> > Reviewed-by: Benson Leung <bleung@chromium.org>
>> >> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
>> >> > ---
>> >> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
>> >> >  1 file changed, 12 insertions(+), 4 deletions(-)
>> >> >
>> >> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
>> >> > index 67075f8..440bc3d 100644
>> >> > --- a/drivers/acpi/device_pm.c
>> >> > +++ b/drivers/acpi/device_pm.c
>> >> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
>> >> >         struct acpi_device *adev = ACPI_COMPANION(dev);
>> >> >         u32 target_state;
>> >> >         bool wakeup;
>> >> > +       bool can_wakeup;
>> >> >         int error;
>> >> >
>> >> >         if (!adev)
>> >> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
>> >> >
>> >> >         target_state = acpi_target_system_state();
>> >> >         wakeup = device_may_wakeup(dev);
>> >> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
>> >> > -       if (wakeup && error)
>> >> > -               return error;
>> >> > +       can_wakeup = acpi_device_can_wakeup(adev);
>> >> > +
>> >> > +       if (can_wakeup) {
>> >> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
>> >> > +               if (wakeup && error)
>> >> > +                       return error;
>> >> > +       } else if (wakeup) {
>> >>
>> >> I think we just need to return an error code in that case, because otherwise
>> >
>> > We used to return error and that error aborted the suspend altogether,
>> > which prompted creating this patch.
>> >
>> >> this is potentially dangerous (worst case, it may be impossible to wake up
>> >> the machine at all after that).
>> >
>> > Yes, there is such potential, but that kind of error (no working wakeup
>> > sources) will be discovered before a box is shipped. Right now we have
>> > boxes in the wild that suspend fine with 3.10 and refuse to suspend with
>> > 3.14 because between 3.10 and 3.14 we started placing i2c devices with
>> > ACPI companions into ACPI power domain and ACPI power domain is now
>> > trying to configure them as wakeup sources and fails.
>>
>> A gentle ping on the patch - without it (or something else) we basically
>> have a regression on shipped hardware: Chromebooks that were
>> suspending fine with 3.10 refuse to suspend with 3.14.
>
> It fell of my radar, sorry about that.
>
> So the error here is that device_may_wakeup(dev) returns true, because the
> device is technically wakeup-capable, but the wakeup is not via ACPI?
>
> I'd say this is rather not in accordance with the spec,

Well, specs, they are mostly like... guidelines ;)

> but that means we
> need to simply ignore 'wakeup' if acpi_device_can_wakeup(adev) returns false.
>
> So what about the appended patch?

Would work as well with the difference that your version is silent so next time
firmware engineers come up with similar stuff it will stay unnoticed.

I am happy with either version.

Thanks.

-- 
Dmitry

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Rafael J. Wysocki]

On Tuesday, November 18, 2014 03:31:26 PM Dmitry Torokhov wrote:
> On Tue, Nov 18, 2014 at 3:43 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> > On Tuesday, November 18, 2014 10:00:53 AM Dmitry Torokhov wrote:
> >> Hi Rafael,
> >>
> >> On Thu, Oct 16, 2014 at 9:05 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> >> > Hi Rafael,
> >> >
> >> > On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
> >> >> Hi,
> >> >>
> >> >> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> >> >> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
> >> >> > then ACPI will try to configure them for wakeup (if requested).
> >> >> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
> >> >> > completely separate device (which is handled by the kernel as a sleep
> >> >> > button), leaving the touchpads themselves not wakeup capable (as far as
> >> >> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
> >> >> > them as wakeup sources and aborts entire suspend.
> >> >> >
> >> >> > To work around this issues let's not abort entire suspend process if
> >> >> > driver asked to be a wakeup source but ACPI can not satisfy that
> >> >> > request.
> >> >> >
> >> >> > Note that originally I tried to simply change the driver to not mark
> >> >> > device as wakeup source, unfortunately then we do not know that we
> >> >> > should not be powering down the device completely, otherwise we can't
> >> >> > wake up.
> >> >> >
> >> >> > Verified by making sure that "echo mem > /sys/power/state" works on
> >> >> > Squawks.
> >> >> >
> >> >> > Reviewed-by: Benson Leung <bleung@chromium.org>
> >> >> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> >> >> > ---
> >> >> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
> >> >> >  1 file changed, 12 insertions(+), 4 deletions(-)
> >> >> >
> >> >> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> >> >> > index 67075f8..440bc3d 100644
> >> >> > --- a/drivers/acpi/device_pm.c
> >> >> > +++ b/drivers/acpi/device_pm.c
> >> >> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
> >> >> >         struct acpi_device *adev = ACPI_COMPANION(dev);
> >> >> >         u32 target_state;
> >> >> >         bool wakeup;
> >> >> > +       bool can_wakeup;
> >> >> >         int error;
> >> >> >
> >> >> >         if (!adev)
> >> >> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
> >> >> >
> >> >> >         target_state = acpi_target_system_state();
> >> >> >         wakeup = device_may_wakeup(dev);
> >> >> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
> >> >> > -       if (wakeup && error)
> >> >> > -               return error;
> >> >> > +       can_wakeup = acpi_device_can_wakeup(adev);
> >> >> > +
> >> >> > +       if (can_wakeup) {
> >> >> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
> >> >> > +               if (wakeup && error)
> >> >> > +                       return error;
> >> >> > +       } else if (wakeup) {
> >> >>
> >> >> I think we just need to return an error code in that case, because otherwise
> >> >
> >> > We used to return error and that error aborted the suspend altogether,
> >> > which prompted creating this patch.
> >> >
> >> >> this is potentially dangerous (worst case, it may be impossible to wake up
> >> >> the machine at all after that).
> >> >
> >> > Yes, there is such potential, but that kind of error (no working wakeup
> >> > sources) will be discovered before a box is shipped. Right now we have
> >> > boxes in the wild that suspend fine with 3.10 and refuse to suspend with
> >> > 3.14 because between 3.10 and 3.14 we started placing i2c devices with
> >> > ACPI companions into ACPI power domain and ACPI power domain is now
> >> > trying to configure them as wakeup sources and fails.
> >>
> >> A gentle ping on the patch - without it (or something else) we basically
> >> have a regression on shipped hardware: Chromebooks that were
> >> suspending fine with 3.10 refuse to suspend with 3.14.
> >
> > It fell of my radar, sorry about that.
> >
> > So the error here is that device_may_wakeup(dev) returns true, because the
> > device is technically wakeup-capable, but the wakeup is not via ACPI?
> >
> > I'd say this is rather not in accordance with the spec,
> 
> Well, specs, they are mostly like... guidelines ;)

Just don't tell me ...

> > but that means we
> > need to simply ignore 'wakeup' if acpi_device_can_wakeup(adev) returns false.
> >
> > So what about the appended patch?
> 
> Would work as well with the difference that your version is silent so next time
> firmware engineers come up with similar stuff it will stay unnoticed.

We need to accept this kind of breakage already and the warning can easily get
ignored during validation ("wakes up" == "works").  Past that, the firmware
engineers in question don't care any more.

> I am happy with either version.

OK, I'll apply the simpler one, then. :-)

Rafael

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Rafael J. Wysocki]

On Wednesday, November 19, 2014 01:00:29 AM Rafael J. Wysocki wrote:
> On Tuesday, November 18, 2014 03:31:26 PM Dmitry Torokhov wrote:
> > On Tue, Nov 18, 2014 at 3:43 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> > > On Tuesday, November 18, 2014 10:00:53 AM Dmitry Torokhov wrote:
> > >> Hi Rafael,
> > >>
> > >> On Thu, Oct 16, 2014 at 9:05 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> > >> > Hi Rafael,
> > >> >
> > >> > On Thu, Oct 16, 2014 at 10:10:20AM +0200, Rafael J. Wysocki wrote:
> > >> >> Hi,
> > >> >>
> > >> >> On Thu, Oct 16, 2014 at 12:56 AM, Dmitry Torokhov <dtor@chromium.org> wrote:
> > >> >> > Newer kernels put i2c devices with ACPI companion in ACPI power domain and
> > >> >> > then ACPI will try to configure them for wakeup (if requested).
> > >> >> > Unfortunately on some Chromebooks firmware separates wakeup GPIO into a
> > >> >> > completely separate device (which is handled by the kernel as a sleep
> > >> >> > button), leaving the touchpads themselves not wakeup capable (as far as
> > >> >> > ACPI is concerned). This causes ACPI late suspend code to fail to configure
> > >> >> > them as wakeup sources and aborts entire suspend.
> > >> >> >
> > >> >> > To work around this issues let's not abort entire suspend process if
> > >> >> > driver asked to be a wakeup source but ACPI can not satisfy that
> > >> >> > request.
> > >> >> >
> > >> >> > Note that originally I tried to simply change the driver to not mark
> > >> >> > device as wakeup source, unfortunately then we do not know that we
> > >> >> > should not be powering down the device completely, otherwise we can't
> > >> >> > wake up.
> > >> >> >
> > >> >> > Verified by making sure that "echo mem > /sys/power/state" works on
> > >> >> > Squawks.
> > >> >> >
> > >> >> > Reviewed-by: Benson Leung <bleung@chromium.org>
> > >> >> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> > >> >> > ---
> > >> >> >  drivers/acpi/device_pm.c | 16 ++++++++++++----
> > >> >> >  1 file changed, 12 insertions(+), 4 deletions(-)
> > >> >> >
> > >> >> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> > >> >> > index 67075f8..440bc3d 100644
> > >> >> > --- a/drivers/acpi/device_pm.c
> > >> >> > +++ b/drivers/acpi/device_pm.c
> > >> >> > @@ -871,6 +871,7 @@ int acpi_dev_suspend_late(struct device *dev)
> > >> >> >         struct acpi_device *adev = ACPI_COMPANION(dev);
> > >> >> >         u32 target_state;
> > >> >> >         bool wakeup;
> > >> >> > +       bool can_wakeup;
> > >> >> >         int error;
> > >> >> >
> > >> >> >         if (!adev)
> > >> >> > @@ -878,12 +879,19 @@ int acpi_dev_suspend_late(struct device *dev)
> > >> >> >
> > >> >> >         target_state = acpi_target_system_state();
> > >> >> >         wakeup = device_may_wakeup(dev);
> > >> >> > -       error = acpi_device_wakeup(adev, target_state, wakeup);
> > >> >> > -       if (wakeup && error)
> > >> >> > -               return error;
> > >> >> > +       can_wakeup = acpi_device_can_wakeup(adev);
> > >> >> > +
> > >> >> > +       if (can_wakeup) {
> > >> >> > +               error = acpi_device_wakeup(adev, target_state, wakeup);
> > >> >> > +               if (wakeup && error)
> > >> >> > +                       return error;
> > >> >> > +       } else if (wakeup) {
> > >> >>
> > >> >> I think we just need to return an error code in that case, because otherwise
> > >> >
> > >> > We used to return error and that error aborted the suspend altogether,
> > >> > which prompted creating this patch.
> > >> >
> > >> >> this is potentially dangerous (worst case, it may be impossible to wake up
> > >> >> the machine at all after that).
> > >> >
> > >> > Yes, there is such potential, but that kind of error (no working wakeup
> > >> > sources) will be discovered before a box is shipped. Right now we have
> > >> > boxes in the wild that suspend fine with 3.10 and refuse to suspend with
> > >> > 3.14 because between 3.10 and 3.14 we started placing i2c devices with
> > >> > ACPI companions into ACPI power domain and ACPI power domain is now
> > >> > trying to configure them as wakeup sources and fails.
> > >>
> > >> A gentle ping on the patch - without it (or something else) we basically
> > >> have a regression on shipped hardware: Chromebooks that were
> > >> suspending fine with 3.10 refuse to suspend with 3.14.
> > >
> > > It fell of my radar, sorry about that.
> > >
> > > So the error here is that device_may_wakeup(dev) returns true, because the
> > > device is technically wakeup-capable, but the wakeup is not via ACPI?
> > >
> > > I'd say this is rather not in accordance with the spec,
> > 
> > Well, specs, they are mostly like... guidelines ;)
> 
> Just don't tell me ...
> 
> > > but that means we
> > > need to simply ignore 'wakeup' if acpi_device_can_wakeup(adev) returns false.
> > >
> > > So what about the appended patch?
> > 
> > Would work as well with the difference that your version is silent so next time
> > firmware engineers come up with similar stuff it will stay unnoticed.
> 
> We need to accept this kind of breakage already and the warning can easily get
> ignored during validation ("wakes up" == "works").  Past that, the firmware
> engineers in question don't care any more.
> 
> > I am happy with either version.
> 
> OK, I'll apply the simpler one, then. :-)

It goes again below with a changelog, but since technically it is a regression
fix, I'd like to push it for "stable" too.  I suppose that the commit that
things stopped working after is a76e9bd89ae7 (i2c: attach/detach I2C client
device to the ACPI power domain).  Is that correct?

Rafael


--
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up

As reported by Dmitry, on some Chromebooks there are devices with
corresponding ACPI objects and with unusual system wakeup
configuration.  Namely, they technically are wakeup-capable, but the
wakeup is handled via a platform-specific out-of-band mechanism
rather than by standard ACPI means.  As a result, the
device_may_wakeup(dev) called from acpi_dev_suspend_late() returns
'true' for them, but the wakeup.flags.valid flag is unset for the
corresponding ACPI device objects, so acpi_dev_suspend_late()
reproducibly returns an error for them causing the entire system
suspend to be aborted.  Consequently, system suspend doesn't work
on those machines at all.

Address the problem by ignoring the device_may_wakeup(dev) return
value in acpi_dev_suspend_late() if the ACPI companion of the device
in question has wakeup.flags.valid unset (in which case it is clear
that the wakeup cannot happen via ACPI).

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/device_pm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
--- linux-pm.orig/drivers/acpi/device_pm.c
+++ linux-pm/drivers/acpi/device_pm.c
@@ -878,7 +878,7 @@ int acpi_dev_suspend_late(struct device
 		return 0;
 
 	target_state = acpi_target_system_state();
-	wakeup = device_may_wakeup(dev);
+	wakeup = device_may_wakeup(dev) && acpi_device_can_wakeup(adev);
 	error = acpi_device_wakeup(adev, target_state, wakeup);
 	if (wakeup && error)
 		return error;

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

On Tue, Nov 18, 2014 at 4:20 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> It goes again below with a changelog, but since technically it is a regression
> fix, I'd like to push it for "stable" too.  I suppose that the commit that
> things stopped working after is a76e9bd89ae7 (i2c: attach/detach I2C client
> device to the ACPI power domain).  Is that correct?

Yes.

>
> Rafael
>
>
> --
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
>
> As reported by Dmitry, on some Chromebooks there are devices with
> corresponding ACPI objects and with unusual system wakeup
> configuration.  Namely, they technically are wakeup-capable, but the
> wakeup is handled via a platform-specific out-of-band mechanism
> rather than by standard ACPI means.

I think they are using standard ACPI wakeup methods, but in a very perverted
way: there is "shadow" ACPI sleep button corresponding to the GPIO assigned
to the trackpad or touchscreen; it is just not tied to touchpad/touchscreen
device in DSDT.

We won't have such set up again, but we do have existing boxes that are
like that.

>  As a result, the
> device_may_wakeup(dev) called from acpi_dev_suspend_late() returns
> 'true' for them, but the wakeup.flags.valid flag is unset for the
> corresponding ACPI device objects, so acpi_dev_suspend_late()
> reproducibly returns an error for them causing the entire system
> suspend to be aborted.  Consequently, system suspend doesn't work
> on those machines at all.
>
> Address the problem by ignoring the device_may_wakeup(dev) return
> value in acpi_dev_suspend_late() if the ACPI companion of the device
> in question has wakeup.flags.valid unset (in which case it is clear
> that the wakeup cannot happen via ACPI).
>
> Reported-by: Dmitry Torokhov <dtor@chromium.org>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>  drivers/acpi/device_pm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-pm/drivers/acpi/device_pm.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/device_pm.c
> +++ linux-pm/drivers/acpi/device_pm.c
> @@ -878,7 +878,7 @@ int acpi_dev_suspend_late(struct device
>                 return 0;
>
>         target_state = acpi_target_system_state();
> -       wakeup = device_may_wakeup(dev);
> +       wakeup = device_may_wakeup(dev) && acpi_device_can_wakeup(adev);
>         error = acpi_device_wakeup(adev, target_state, wakeup);
>         if (wakeup && error)
>                 return error;
>

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Rafael J. Wysocki]

On Tuesday, November 18, 2014 04:14:49 PM Dmitry Torokhov wrote:
> On Tue, Nov 18, 2014 at 4:20 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> > It goes again below with a changelog, but since technically it is a regression
> > fix, I'd like to push it for "stable" too.  I suppose that the commit that
> > things stopped working after is a76e9bd89ae7 (i2c: attach/detach I2C client
> > device to the ACPI power domain).  Is that correct?
> 
> Yes.

OK

> > --
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
> >
> > As reported by Dmitry, on some Chromebooks there are devices with
> > corresponding ACPI objects and with unusual system wakeup
> > configuration.  Namely, they technically are wakeup-capable, but the
> > wakeup is handled via a platform-specific out-of-band mechanism
> > rather than by standard ACPI means.
> 
> I think they are using standard ACPI wakeup methods, but in a very perverted
> way: there is "shadow" ACPI sleep button corresponding to the GPIO assigned
> to the trackpad or touchscreen; it is just not tied to touchpad/touchscreen
> device in DSDT.

OK

This:

---
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up

As reported by Dmitry, on some Chromebooks there are devices with
corresponding ACPI objects and with unusual system wakeup
configuration.  Namely, they technically are wakeup-capable, but the
wakeup is handled via a platform-specific out-of-band mechanism and
the ACPI PM layer has no information on the wakeup capability.  As
a result, device_may_wakeup(dev) called from acpi_dev_suspend_late()
returns 'true' for those devices, but the wakeup.flags.valid flag is
unset for the corresponding ACPI device objects, so acpi_device_wakeup()
reproducibly fails for them causing acpi_dev_suspend_late() to return
an error code.  The entire system suspend is then aborted and the
machines in question cannot suspend at all.

Address the problem by ignoring the device_may_wakeup(dev) return
value in acpi_dev_suspend_late() if the ACPI companion of the device
being handled has wakeup.flags.valid unset (in which case it is clear
that the wakeup is supposed to be handled by other means).

This fixes a regression introduced by commit a76e9bd89ae7 (i2c:
attach/detach I2C client device to the ACPI power domain) as the
affected systems could suspend and resume successfully before that
commit.

Fixes: a76e9bd89ae7 (i2c: attach/detach I2C client device to the ACPI power domain)
Reported-by: Dmitry Torokhov <dtor@chromium.org>
Cc: 3.13+ <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/device_pm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
--- linux-pm.orig/drivers/acpi/device_pm.c
+++ linux-pm/drivers/acpi/device_pm.c
@@ -878,7 +878,7 @@ int acpi_dev_suspend_late(struct device
 		return 0;
 
 	target_state = acpi_target_system_state();
-	wakeup = device_may_wakeup(dev);
+	wakeup = device_may_wakeup(dev) && acpi_device_can_wakeup(adev);
 	error = acpi_device_wakeup(adev, target_state, wakeup);
 	if (wakeup && error)
 		return error;

Re: [PATCH] ACPI: do not fail suspend if unable to configure wakeup

[Dmitry Torokhov]

On Tue, Nov 18, 2014 at 5:01 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> On Tuesday, November 18, 2014 04:14:49 PM Dmitry Torokhov wrote:
>> On Tue, Nov 18, 2014 at 4:20 PM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>> > It goes again below with a changelog, but since technically it is a regression
>> > fix, I'd like to push it for "stable" too.  I suppose that the commit that
>> > things stopped working after is a76e9bd89ae7 (i2c: attach/detach I2C client
>> > device to the ACPI power domain).  Is that correct?
>>
>> Yes.
>
> OK
>
>> > --
>> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>> > Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
>> >
>> > As reported by Dmitry, on some Chromebooks there are devices with
>> > corresponding ACPI objects and with unusual system wakeup
>> > configuration.  Namely, they technically are wakeup-capable, but the
>> > wakeup is handled via a platform-specific out-of-band mechanism
>> > rather than by standard ACPI means.
>>
>> I think they are using standard ACPI wakeup methods, but in a very perverted
>> way: there is "shadow" ACPI sleep button corresponding to the GPIO assigned
>> to the trackpad or touchscreen; it is just not tied to touchpad/touchscreen
>> device in DSDT.
>
> OK
>
> This:
>
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
>
> As reported by Dmitry, on some Chromebooks there are devices with
> corresponding ACPI objects and with unusual system wakeup
> configuration.  Namely, they technically are wakeup-capable, but the
> wakeup is handled via a platform-specific out-of-band mechanism and
> the ACPI PM layer has no information on the wakeup capability.  As
> a result, device_may_wakeup(dev) called from acpi_dev_suspend_late()
> returns 'true' for those devices, but the wakeup.flags.valid flag is
> unset for the corresponding ACPI device objects, so acpi_device_wakeup()
> reproducibly fails for them causing acpi_dev_suspend_late() to return
> an error code.  The entire system suspend is then aborted and the
> machines in question cannot suspend at all.
>
> Address the problem by ignoring the device_may_wakeup(dev) return
> value in acpi_dev_suspend_late() if the ACPI companion of the device
> being handled has wakeup.flags.valid unset (in which case it is clear
> that the wakeup is supposed to be handled by other means).
>
> This fixes a regression introduced by commit a76e9bd89ae7 (i2c:
> attach/detach I2C client device to the ACPI power domain) as the
> affected systems could suspend and resume successfully before that
> commit.
>
> Fixes: a76e9bd89ae7 (i2c: attach/detach I2C client device to the ACPI power domain)
> Reported-by: Dmitry Torokhov <dtor@chromium.org>

Excellent, thank you Rafael.

Reviewed-by: Dmitry Torokhov <dtor@chromium.org>

> Cc: 3.13+ <stable@vger.kernel.org>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>  drivers/acpi/device_pm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-pm/drivers/acpi/device_pm.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/device_pm.c
> +++ linux-pm/drivers/acpi/device_pm.c
> @@ -878,7 +878,7 @@ int acpi_dev_suspend_late(struct device
>                 return 0;
>
>         target_state = acpi_target_system_state();
> -       wakeup = device_may_wakeup(dev);
> +       wakeup = device_may_wakeup(dev) && acpi_device_can_wakeup(adev);
>         error = acpi_device_wakeup(adev, target_state, wakeup);
>         if (wakeup && error)
>                 return error;
>