Patchwork PCI / ACPI / PM: Clear pme_poll for devices in D3cold on wakeup

login
register
mail settings
Submitter Rafael J. Wysocki
Date Sept. 14, 2013, 1:38 a.m.
Message ID <4974289.QhzOmFXm0s@vostro.rjw.lan>
Download mbox | patch
Permalink /patch/274891/
State Not Applicable
Headers show

Comments

Rafael J. Wysocki - Sept. 14, 2013, 1:38 a.m.
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Commit 448bd85 (PCI/PM: add PCIe runtime D3cold support) added a
piece of code to pci_acpi_wake_dev() causing that function to behave
in a special way for devices in D3cold (so that their configuration
registeres are not accessed before those devices are resumed).
However, it didn't take the clearing of the pme_poll flag into
account.  That has to be done for all devices, even if they are in
D3cold, or pci_pme_list_scan() will not know that wakeup has been
signaled for the device and will poll its PME Status bit
unnecessarily.

Fix the problem by moving the clearing of the pme_poll flag in
pci_acpi_wake_dev() before the code introduced by commit 448bd85.

Reported-and-tested-by: David E. Box <david.e.box@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.6+ <stable@vger.kernel.org> # 3.6+
---
 drivers/pci/pci-acpi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas - Sept. 19, 2013, 8:51 p.m.
On Fri, Sep 13, 2013 at 7:38 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Commit 448bd85 (PCI/PM: add PCIe runtime D3cold support) added a
> piece of code to pci_acpi_wake_dev() causing that function to behave
> in a special way for devices in D3cold (so that their configuration
> registeres are not accessed before those devices are resumed).

s/registeres/registers/

> However, it didn't take the clearing of the pme_poll flag into
> account.  That has to be done for all devices, even if they are in
> D3cold, or pci_pme_list_scan() will not know that wakeup has been
> signaled for the device and will poll its PME Status bit
> unnecessarily.
>
> Fix the problem by moving the clearing of the pme_poll flag in
> pci_acpi_wake_dev() before the code introduced by commit 448bd85.
>
> Reported-and-tested-by: David E. Box <david.e.box@intel.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> Cc: 3.6+ <stable@vger.kernel.org> # 3.6+
> ---
>  drivers/pci/pci-acpi.c |    6 +++---
>  1 file changed, 3 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
> @@ -47,6 +47,9 @@ static void pci_acpi_wake_dev(acpi_handl
>         if (event != ACPI_NOTIFY_DEVICE_WAKE || !pci_dev)
>                 return;
>
> +       if (pci_dev->pme_poll)
> +               pci_dev->pme_poll = false;
> +
>         if (pci_dev->current_state == PCI_D3cold) {
>                 pci_wakeup_event(pci_dev);
>                 pm_runtime_resume(&pci_dev->dev);
> @@ -57,9 +60,6 @@ static void pci_acpi_wake_dev(acpi_handl
>         if (pci_dev->pme_support)
>                 pci_check_pme_status(pci_dev);
>
> -       if (pci_dev->pme_poll)
> -               pci_dev->pme_poll = false;
> -
>         pci_wakeup_event(pci_dev);
>         pm_runtime_resume(&pci_dev->dev);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-pm/drivers/pci/pci-acpi.c
===================================================================
--- linux-pm.orig/drivers/pci/pci-acpi.c
+++ linux-pm/drivers/pci/pci-acpi.c
@@ -47,6 +47,9 @@  static void pci_acpi_wake_dev(acpi_handl
 	if (event != ACPI_NOTIFY_DEVICE_WAKE || !pci_dev)
 		return;
 
+	if (pci_dev->pme_poll)
+		pci_dev->pme_poll = false;
+
 	if (pci_dev->current_state == PCI_D3cold) {
 		pci_wakeup_event(pci_dev);
 		pm_runtime_resume(&pci_dev->dev);
@@ -57,9 +60,6 @@  static void pci_acpi_wake_dev(acpi_handl
 	if (pci_dev->pme_support)
 		pci_check_pme_status(pci_dev);
 
-	if (pci_dev->pme_poll)
-		pci_dev->pme_poll = false;
-
 	pci_wakeup_event(pci_dev);
 	pm_runtime_resume(&pci_dev->dev);