archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <>
To: Maximilian Luz <>
Cc: Linux PCI <>,
	LKML <>,
	Linux PM <>,
	Bjorn Helgaas <>,
	Mika Westerberg <>
Subject: [PATCH][RFT] PCI: Use pci_update_current_state() in pci_enable_device_flags()
Date: Thu, 08 Jul 2021 15:25:06 +0200	[thread overview]
Message-ID: <4327888.LvFx2qVVIh@kreacher> (raw)

From: Rafael J. Wysocki <>

Updating the current_state field of struct pci_dev the way it is done
in pci_enable_device_flags() before calling do_pci_enable_device() may
not work.  For example, if the given PCI device depends on an ACPI
power resource whose _STA method initially returns 0 ("off"), but the
config space of the PCI device is accessible and the power state
retrieved from the PCI_PM_CTRL register is D0, the current_state
field in the struct pci_dev representing that device will get out of
sync with the power.state of its ACPI companion object and that will
lead to power management issues going forward.

To avoid such issues, make pci_enable_device_flags() call
pci_update_current_state() which takes ACPI device power management
into account, if present, to retrieve the current power state of the

Reported-by: Maximilian Luz <>
Signed-off-by: Rafael J. Wysocki <>

Hi Maximilian,

Because commit 4514d991d992 ("PCI: PM: Do not read power state in
pci_enable_device_flags()"), the issue addressed by it is back, so
we need an alternative way to address it.

Can you please check if this patch makes that issue go away?


 drivers/pci/pci.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Index: linux-pm/drivers/pci/pci.c
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/drivers/pci/pci.c
@@ -1906,11 +1906,7 @@ static int pci_enable_device_flags(struc
 	 * so that things like MSI message writing will behave as expected
 	 * (e.g. if the device really is in D0 at enable time).
-	if (dev->pm_cap) {
-		u16 pmcsr;
-		pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
-		dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
-	}
+	pci_update_current_state(dev, dev->current_state);
 	if (atomic_inc_return(&dev->enable_cnt) > 1)
 		return 0;		/* already enabled */

             reply	other threads:[~2021-07-08 13:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-08 13:25 Rafael J. Wysocki [this message]
2021-07-08 20:33 ` Maximilian Luz
2021-07-09 11:21   ` Rafael J. Wysocki
2021-07-12 15:30     ` Rafael J. Wysocki
2021-07-12 15:32       ` Rafael J. Wysocki

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4327888.LvFx2qVVIh@kreacher \ \ \ \ \ \ \ \
    --subject='Re: [PATCH][RFT] PCI: Use pci_update_current_state() in pci_enable_device_flags()' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).