* [PATCH] ACPI: PM: Fix device wakeup power reference counting error
@ 2021-11-04 17:21 Rafael J. Wysocki
2021-11-04 21:54 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2021-11-04 17:21 UTC (permalink / raw)
To: Linux ACPI; +Cc: LKML, Linux PM, Rafael J. Wysocki
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Fix a device wakeup power reference counting error introduced by
commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power
resources").
Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/power.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: linux-pm/drivers/acpi/power.c
===================================================================
--- linux-pm.orig/drivers/acpi/power.c
+++ linux-pm/drivers/acpi/power.c
@@ -757,10 +757,8 @@ int acpi_disable_wakeup_device_power(str
mutex_lock(&acpi_device_lock);
- if (dev->wakeup.prepare_count > 1) {
+ if (dev->wakeup.prepare_count >= 1)
dev->wakeup.prepare_count--;
- goto out;
- }
/* Do nothing if wakeup power has not been enabled for this device. */
if (!dev->wakeup.prepare_count)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ACPI: PM: Fix device wakeup power reference counting error
2021-11-04 17:21 [PATCH] ACPI: PM: Fix device wakeup power reference counting error Rafael J. Wysocki
@ 2021-11-04 21:54 ` Rafael J. Wysocki
2021-11-05 14:39 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2021-11-04 21:54 UTC (permalink / raw)
To: Linux ACPI; +Cc: LKML, Linux PM, Rafael J. Wysocki
On Thursday, November 4, 2021 6:21:51 PM CET Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Fix a device wakeup power reference counting error introduced by
> commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power
> resources").
>
> Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources")
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/acpi/power.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> Index: linux-pm/drivers/acpi/power.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/power.c
> +++ linux-pm/drivers/acpi/power.c
> @@ -757,10 +757,8 @@ int acpi_disable_wakeup_device_power(str
>
> mutex_lock(&acpi_device_lock);
>
> - if (dev->wakeup.prepare_count > 1) {
> + if (dev->wakeup.prepare_count >= 1)
> dev->wakeup.prepare_count--;
> - goto out;
> - }
>
> /* Do nothing if wakeup power has not been enabled for this device. */
> if (!dev->wakeup.prepare_count)
This is still not good. It should be something like the patch below, but I
need to test that one.
---
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: [PATCH v2] ACPI: PM: Fix device wakeup power reference counting error
Fix a device wakeup power reference counting error introduced by
commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power
resources").
Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
-> v2: Actually disable wakeup power when the reference count becomes zero.
---
drivers/acpi/power.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
Index: linux-pm/drivers/acpi/power.c
===================================================================
--- linux-pm.orig/drivers/acpi/power.c
+++ linux-pm/drivers/acpi/power.c
@@ -757,13 +757,11 @@ int acpi_disable_wakeup_device_power(str
mutex_lock(&acpi_device_lock);
- if (dev->wakeup.prepare_count > 1) {
- dev->wakeup.prepare_count--;
+ /* Do nothing if wakeup power has not been enabled for this device. */
+ if (dev->wakeup.prepare_count <= 0)
goto out;
- }
- /* Do nothing if wakeup power has not been enabled for this device. */
- if (!dev->wakeup.prepare_count)
+ if (--dev->wakeup.prepare_count > 0)
goto out;
err = acpi_device_sleep_wake(dev, 0, 0, 0);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ACPI: PM: Fix device wakeup power reference counting error
2021-11-04 21:54 ` Rafael J. Wysocki
@ 2021-11-05 14:39 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2021-11-05 14:39 UTC (permalink / raw)
To: Linux ACPI; +Cc: LKML, Linux PM, Rafael J. Wysocki
On Thu, Nov 4, 2021 at 10:54 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> On Thursday, November 4, 2021 6:21:51 PM CET Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > Fix a device wakeup power reference counting error introduced by
> > commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power
> > resources").
> >
> > Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources")
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > ---
> > drivers/acpi/power.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > Index: linux-pm/drivers/acpi/power.c
> > ===================================================================
> > --- linux-pm.orig/drivers/acpi/power.c
> > +++ linux-pm/drivers/acpi/power.c
> > @@ -757,10 +757,8 @@ int acpi_disable_wakeup_device_power(str
> >
> > mutex_lock(&acpi_device_lock);
> >
> > - if (dev->wakeup.prepare_count > 1) {
> > + if (dev->wakeup.prepare_count >= 1)
> > dev->wakeup.prepare_count--;
> > - goto out;
> > - }
> >
> > /* Do nothing if wakeup power has not been enabled for this device. */
> > if (!dev->wakeup.prepare_count)
>
> This is still not good. It should be something like the patch below, but I
> need to test that one.
Tested now, so applying as 5.16-rc material.
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: [PATCH v2] ACPI: PM: Fix device wakeup power reference counting error
>
> Fix a device wakeup power reference counting error introduced by
> commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power
> resources").
>
> Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources")
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>
> -> v2: Actually disable wakeup power when the reference count becomes zero.
>
> ---
> drivers/acpi/power.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> Index: linux-pm/drivers/acpi/power.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/power.c
> +++ linux-pm/drivers/acpi/power.c
> @@ -757,13 +757,11 @@ int acpi_disable_wakeup_device_power(str
>
> mutex_lock(&acpi_device_lock);
>
> - if (dev->wakeup.prepare_count > 1) {
> - dev->wakeup.prepare_count--;
> + /* Do nothing if wakeup power has not been enabled for this device. */
> + if (dev->wakeup.prepare_count <= 0)
> goto out;
> - }
>
> - /* Do nothing if wakeup power has not been enabled for this device. */
> - if (!dev->wakeup.prepare_count)
> + if (--dev->wakeup.prepare_count > 0)
> goto out;
>
> err = acpi_device_sleep_wake(dev, 0, 0, 0);
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-05 14:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-04 17:21 [PATCH] ACPI: PM: Fix device wakeup power reference counting error Rafael J. Wysocki
2021-11-04 21:54 ` Rafael J. Wysocki
2021-11-05 14:39 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox