Skip to contentSkip to conversation

PCI PM: Fix handling of devices without PM support by pci_target_state()

PATCH Applied Rafael J. Wysocki 2 participants 3 messages Jun 14, 2009 – Jun 16, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI PM: Fix handling of devices without PM support by pci_target_state()

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

If a PCI device is not power-manageable either by the platform, or with the help of the native PCI PM interface, pci_target_state() will return either PCI_D3hot, or PCI_POWER_ERROR for it, depending on whether or not the device is configured to wake up the system. Alas, none of these return values is correct, because each of them causes pci_prepare_to_sleep() to return error code, although it should complete successfully in such a case.

Fix this problem by making pci_target_state() always return PCI_D0 for devices that cannot be power managed.

---
Hi Jesse,

I think this is 2.6.31 material, probably -stable too.

Best,
Rafael

---
 drivers/pci/pci.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pci.c +2 -3
Index: linux-2.6/drivers/pci/pci.c
===================================================================
@@ -1288,15 +1288,14 @@ pci_power_t pci_target_state(struct pci_
 		default:
 			target_state = state;
 		}
+	} else if (!dev->pm_cap) {
+		target_state = PCI_D0;
 	} else if (device_may_wakeup(&dev->dev)) {
 		/*
 		 * Find the deepest state from which the device can generate
 		 * wake-up events, make it the target state and enable device
 		 * to generate PME#.
 		 */
-		if (!dev->pm_cap)
-			return PCI_POWER_ERROR;
-
 		if (dev->pme_support) {
 			while (target_state
 			      && !(dev->pme_support & (1 << target_state)))
Applied
#1 lore raw
Quoted 10 lines · On Sun, 14 Jun 2009 21:25:02 +0200 "Rafael J. Wysocki" <[email protected]> wrote:

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

If a PCI device is not power-manageable either by the platform, or with the help of the native PCI PM interface, pci_target_state() will return either PCI_D3hot, or PCI_POWER_ERROR for it, depending on whether or not the device is configured to wake up the system. Alas, none of these return values is correct, because each of them causes pci_prepare_to_sleep() to return error code, although it should complete successfully in such a case.

Quoted 8 lines

Fix this problem by making pci_target_state() always return PCI_D0 for devices that cannot be power managed.

---
Hi Jesse,

I think this is 2.6.31 material, probably -stable too.

Applied to my linux-next branch, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Applied
#2 lore raw
In reply to Rafael J. Wysocki
Quoted 10 lines · On Sun, 14 Jun 2009 21:25:02 +0200 "Rafael J. Wysocki" <[email protected]> wrote:

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

If a PCI device is not power-manageable either by the platform, or with the help of the native PCI PM interface, pci_target_state() will return either PCI_D3hot, or PCI_POWER_ERROR for it, depending on whether or not the device is configured to wake up the system. Alas, none of these return values is correct, because each of them causes pci_prepare_to_sleep() to return error code, although it should complete successfully in such a case.

Quoted 8 lines

Fix this problem by making pci_target_state() always return PCI_D0 for devices that cannot be power managed.

---
Hi Jesse,

I think this is 2.6.31 material, probably -stable too.

Applied to my linux-next branch, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center