archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <>
To: Bjorn Helgaas <>,
	Maximilian Luz <>
Cc: LKML <>,
	Linux PCI <>,
	Linux PM <>,
	Mika Westerberg <>,
	Linux ACPI <>
Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()
Date: Tue, 16 Mar 2021 16:51:40 +0100	[thread overview]
Message-ID: <3219454.74lMxhSOWB@kreacher> (raw)

From: Rafael J. Wysocki <>

It should not be necessary to update the current_state field of
struct pci_dev in pci_enable_device_flags() before calling
do_pci_enable_device() for the device, because none of the
code between that point and the pci_set_power_state() call in
do_pci_enable_device() invoked later depends on it.

Moreover, doing that is actively harmful in some cases.  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 it is better to leave the current_state value
as is until it is changed to PCI_D0 by do_pci_enable_device() as
appropriate.  However, the power state of the device is not changed
to PCI_D0 if it is already enabled when pci_enable_device_flags()
gets called for it, so update its current_state in that case, but
use pci_update_current_state() covering platform PM too for that.

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

Max, I've added a T-by from you even though the patch is slightly different
from what you have tested, but the difference shouldn't matter for your case.

 drivers/pci/pci.c |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

Index: linux-pm/drivers/pci/pci.c
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/drivers/pci/pci.c
@@ -1870,20 +1870,10 @@ static int pci_enable_device_flags(struc
 	int err;
 	int i, bars = 0;
-	/*
-	 * Power state could be unknown at this point, either due to a fresh
-	 * boot or a device removal call.  So get the current power state
-	 * 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);
-	}
-	if (atomic_inc_return(&dev->enable_cnt) > 1)
+	if (atomic_inc_return(&dev->enable_cnt) > 1) {
+		pci_update_current_state(dev, dev->current_state);
 		return 0;		/* already enabled */
+	}
 	bridge = pci_upstream_bridge(dev);
 	if (bridge)

             reply	other threads:[~2021-03-16 15:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 15:51 Rafael J. Wysocki [this message]
2021-03-16 22:28 ` Maximilian Luz
2021-03-17 10:02 ` Mika Westerberg
2021-03-22 14:32 ` Rafael J. Wysocki
2021-03-24 15:43   ` Rafael J. Wysocki
2021-06-21 19:27 ` Salvatore Bonaccorso
2021-06-23 17:52   ` 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=3219454.74lMxhSOWB@kreacher \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH] PCI: PM: Do not read power 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).