Skip to contentSkip to conversation

PCI PM: Read device power state from register after updating it (rev. 2)

PATCH In review Rafael J. Wysocki 4 participants 14 messages Sep 21, 2009 – Sep 22, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI PM: Read device power state from register after updating it (rev. 2)

From: Rafael J. Wysocki <[email protected]>

After attempting to change the power state of a PCI device pci_raw_set_power_state() doesn't check if the value it wrote into the device's PCI_PM_CTRL register has been stored in there, but unconditionally modifies the device's current_state field to reflect the change. This may cause problems to happen if the power state of the device hasn't been changed in fact, because it will make the PCI PM core think that the device is in a power state it really is not in.

To prevent such situations from happening modify pci_raw_set_power_state() so that it reads the device's PCI_PM_CTRL register after writing into it and uses the value read from the register to update the device's current_state field. Also make it print a message saying that the device refused to change its power state as requested (returning an error code in such cases would cause suspend regressions to appear on some systems, where device drivers' suspend routines return error codes if pci_set_power_state() fails).

---
 drivers/pci/pci.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/pci.c +6 -1
Index: linux-2.6/drivers/pci/pci.c
===================================================================
@@ -513,7 +513,12 @@ static int pci_raw_set_power_state(struc
 	else if (state == PCI_D2 || dev->current_state == PCI_D2)
 		udelay(PCI_PM_D2_DELAY);
 
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	/* Return error code if we have failed to change the state */
+	if (dev->current_state != state)
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);
 
 	/* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
 	 * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning
#1 lore raw

drivers/pci/pci.c static int pci_raw_set_power_state(struc · line 521

Quoted 8 lines · On Mon, 21 Sep 2009 23:37:01 +0200 "Rafael J. Wysocki" <[email protected]> wrote:
drivers/pci/pci.c +6 -1
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	/* Return error code if we have failed to change the state */
+	if (dev->current_state != state)
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);

I would suspect that you want this message only once... to avoid it flooding logs and such

or at least ratelimiting it

Signature · 3 lines
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
#2 lore raw
Quoted 13 lines · Arjan van de Ven

drivers/pci/pci.c static int pci_raw_set_power_state(struc · line 521

Quoted 8 lines · On Mon, 21 Sep 2009 23:37:01 +0200 "Rafael J. Wysocki" <[email protected]> wrote:
drivers/pci/pci.c +6 -1
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	/* Return error code if we have failed to change the state */
+	if (dev->current_state != state)
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);

I would suspect that you want this message only once... to avoid it flooding logs and such

Hmm? I don't think we use pci_set_power_state() _that_ often.

Quoted 1 line

or at least ratelimiting it

That sounds like a good idea, though, will respin.

#3 lore raw
In reply to Arjan van de Ven
Quoted 13 lines · Arjan van de Ven

drivers/pci/pci.c static int pci_raw_set_power_state(struc · line 521

Quoted 8 lines · On Mon, 21 Sep 2009 23:37:01 +0200 "Rafael J. Wysocki" <[email protected]> wrote:
drivers/pci/pci.c +6 -1
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	/* Return error code if we have failed to change the state */
+	if (dev->current_state != state)
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);

I would suspect that you want this message only once... to avoid it flooding logs and such

Hmm? I don't think we use pci_set_power_state() _that_ often.

Quoted 1 line

or at least ratelimiting it

That sounds like a good idea, though, will respin.

#4 lore raw
In reply to Rafael J. Wysocki

drivers/pci/pci.c static int pci_raw_set_power_state(struc · line 521

Quoted 8 lines · On Mon, 21 Sep 2009 23:37:01 +0200 "Rafael J. Wysocki" <[email protected]> wrote:
drivers/pci/pci.c +6 -1
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	/* Return error code if we have failed to change the state */
+	if (dev->current_state != state)
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);

I would suspect that you want this message only once... to avoid it flooding logs and such

or at least ratelimiting it

Signature · 3 lines
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
#6 lore raw
Quoted 1 line · Andreas Mohr

Hi Rafael,

Hi,

Quoted 2 lines

first you say "returning an error code in such cases would..." and then the patch content has...?

I don't quite understand your comment, care to elaborate?

Rafael

#7 lore raw
Quoted 11 lines · Rafael J. Wysocki
Quoted 1 line · Andreas Mohr

Hi Rafael,

Hi,

Quoted 2 lines

first you say "returning an error code in such cases would..." and then the patch content has...?

I don't quite understand your comment, care to elaborate?

I think this is what was being referenced:

+ /* Return error code if we have failed to change the state */
+ if (dev->current_state != state)
+ dev_info(&dev->dev, "Refused to change power state, "
+ "currently in D%d\n", dev->current_state);

The comment says, "Return error code", where it should probably say, "Log error". Or possibly no comment at all.

-Kevin Granade

Quoted 7 lines

Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#8 lore raw
Quoted 20 lines · kevin granade
Quoted 11 lines · Rafael J. Wysocki
Quoted 1 line · Andreas Mohr

Hi Rafael,

Hi,

Quoted 2 lines

first you say "returning an error code in such cases would..." and then the patch content has...?

I don't quite understand your comment, care to elaborate?

I think this is what was being referenced:

drivers/pci/pci.c +4 -0
+       /* Return error code if we have failed to change the state */
+       if (dev->current_state != state)
+               dev_info(&dev->dev, "Refused to change power state, "
+                       "currently in D%d\n", dev->current_state);
Quoted 2 lines

The comment says, "Return error code", where it should probably say, "Log error". Or possibly no comment at all.

Ah, thanks.

Rafael

#9 lore raw
In reply to kevin granade
Quoted 20 lines · kevin granade
Quoted 11 lines · Rafael J. Wysocki
Quoted 1 line · Andreas Mohr

Hi Rafael,

Hi,

Quoted 2 lines

first you say "returning an error code in such cases would..." and then the patch content has...?

I don't quite understand your comment, care to elaborate?

I think this is what was being referenced:

drivers/pci/pci.c +4 -0
+       /* Return error code if we have failed to change the state */
+       if (dev->current_state != state)
+               dev_info(&dev->dev, "Refused to change power state, "
+                       "currently in D%d\n", dev->current_state);
Quoted 2 lines

The comment says, "Return error code", where it should probably say, "Log error". Or possibly no comment at all.

Ah, thanks.

Rafael

#10 lore raw
In reply to Andreas Mohr
Quoted 1 line · Andreas Mohr

Hi Rafael,

Hi,

Quoted 2 lines

first you say "returning an error code in such cases would..." and then the patch content has...?

I don't quite understand your comment, care to elaborate?

Rafael

#12 lore raw

PATCH 1/1 PCI PM: Read device power state from register after updating it (rev. 3)

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

After attempting to change the power state of a PCI device pci_raw_set_power_state() doesn't check if the value it wrote into the device's PCI_PM_CTRL register has been stored in there, but unconditionally modifies the device's current_state field to reflect the change. This may cause problems to happen if the power state of the device hasn't been changed in fact, because it will make the PCI PM core think that the device is in a power state it really is not in.

To prevent such situations from happening modify pci_raw_set_power_state() so that it reads the device's PCI_PM_CTRL register after writing into it and uses the value read from the register to update the device's current_state field. Also make it print a message saying that the device refused to change its power state as requested (returning an error code in such cases would cause suspend regressions to appear on some systems, where device drivers' suspend routines return error codes if pci_set_power_state() fails).

---
Respin to fix issues pointed out by the reviewers.

Thanks,
Rafael

---
 drivers/pci/pci.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/pci.c +5 -1
Index: linux-2.6/drivers/pci/pci.c
===================================================================
@@ -513,7 +513,11 @@ static int pci_raw_set_power_state(struc
 	else if (state == PCI_D2 || dev->current_state == PCI_D2)
 		udelay(PCI_PM_D2_DELAY);
 
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	if (dev->current_state != state && printk_ratelimit())
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);
 
 	/* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
 	 * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning
#13 lore raw

PATCH 1/1 PCI PM: Read device power state from register after updating it (rev. 3)

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

After attempting to change the power state of a PCI device pci_raw_set_power_state() doesn't check if the value it wrote into the device's PCI_PM_CTRL register has been stored in there, but unconditionally modifies the device's current_state field to reflect the change. This may cause problems to happen if the power state of the device hasn't been changed in fact, because it will make the PCI PM core think that the device is in a power state it really is not in.

To prevent such situations from happening modify pci_raw_set_power_state() so that it reads the device's PCI_PM_CTRL register after writing into it and uses the value read from the register to update the device's current_state field. Also make it print a message saying that the device refused to change its power state as requested (returning an error code in such cases would cause suspend regressions to appear on some systems, where device drivers' suspend routines return error codes if pci_set_power_state() fails).

---
Respin to fix issues pointed out by the reviewers.

Thanks,
Rafael

---
 drivers/pci/pci.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/pci.c +5 -1
Index: linux-2.6/drivers/pci/pci.c
===================================================================
@@ -513,7 +513,11 @@ static int pci_raw_set_power_state(struc
 	else if (state == PCI_D2 || dev->current_state == PCI_D2)
 		udelay(PCI_PM_D2_DELAY);
 
-	dev->current_state = state;
+	pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+	if (dev->current_state != state && printk_ratelimit())
+		dev_info(&dev->dev, "Refused to change power state, "
+			"currently in D%d\n", dev->current_state);
 
 	/* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
 	 * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning