From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Bjorn Helgaas <helgaas@kernel.org>
Cc: Linux ACPI <linux-acpi@vger.kernel.org>,
Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Linux PCI <linux-pci@vger.kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: [PATCH] ACPI/PCI: PM: Add missing wakeup.flags.valid checks
Date: Mon, 27 May 2019 13:01:45 +0200 [thread overview]
Message-ID: <1872097.3m3ZAFDl4C@kreacher> (raw)
In-Reply-To: <2091978.9z20bSIm3T@kreacher>
On Thursday, May 16, 2019 12:42:20 PM CEST Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Both acpi_pci_need_resume() and acpi_dev_needs_resume() check if the
> current ACPI wakeup configuration of the device matches what is
> expected as far as system wakeup from sleep states is concerned, as
> reflected by the device_may_wakeup() return value for the device.
>
> However, they only should do that if wakeup.flags.valid is set for
> the device's ACPI companion, because otherwise the wakeup.prepare_count
> value for it is meaningless.
>
> Add the missing wakeup.flags.valid checks to these functions.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/acpi/device_pm.c | 4 ++--
> drivers/pci/pci-acpi.c | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> Index: linux-pm/drivers/pci/pci-acpi.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci-acpi.c
> +++ linux-pm/drivers/pci/pci-acpi.c
> @@ -666,7 +666,8 @@ static bool acpi_pci_need_resume(struct
> if (!adev || !acpi_device_power_manageable(adev))
> return false;
>
> - if (device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count)
> + if (adev->wakeup.flags.valid &&
> + device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count)
> return true;
>
> if (acpi_target_system_state() == ACPI_STATE_S0)
> Index: linux-pm/drivers/acpi/device_pm.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/device_pm.c
> +++ linux-pm/drivers/acpi/device_pm.c
> @@ -952,8 +952,8 @@ static bool acpi_dev_needs_resume(struct
> u32 sys_target = acpi_target_system_state();
> int ret, state;
>
> - if (!pm_runtime_suspended(dev) || !adev ||
> - device_may_wakeup(dev) != !!adev->wakeup.prepare_count)
> + if (!pm_runtime_suspended(dev) || !adev || (adev->wakeup.flags.valid &&
> + device_may_wakeup(dev) != !!adev->wakeup.prepare_count))
> return true;
>
> if (sys_target == ACPI_STATE_S0)
Bjorn, I've assumed no concerns or objections from you regarding this one and
queued this up.
If that assumption is incorrect, please let me know.
prev parent reply other threads:[~2019-05-27 11:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 10:42 [PATCH] ACPI/PCI: PM: Add missing wakeup.flags.valid checks Rafael J. Wysocki
2019-05-17 7:32 ` Mika Westerberg
2019-05-27 11:01 ` Rafael J. Wysocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1872097.3m3ZAFDl4C@kreacher \
--to=rjw@rjwysocki.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).