[PATCH 2/2] PCI PM: Fix pci_update_current_state

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Rafael J. Wysocki <rjw@xxxxxxx>

Currently, PCI devices without the PM capability that are power

manageable by the platform (eg. ACPI) are not handled correctly

by pci_set_power_state(), because their current_state field is not

updated to reflect the new power state of the device. Fix this by

making pci_update_current_state() accept additional argument

representing the power state of the device as set by the platform.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

---

drivers/pci/pci.c | 9 ++++++---

1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6/drivers/pci/pci.c

===================================================================

--- linux-2.6.orig/drivers/pci/pci.c

+++ linux-2.6/drivers/pci/pci.c

@@ -524,14 +524,17 @@ pci_raw_set_power_state(struct pci_dev *

* pci_update_current_state - Read PCI power state of given device from its

* PCI PM registers and cache it

* @dev: PCI device to handle.

+ * @state: State to cache in case the device doesn't have the PM capability

*/

-static void pci_update_current_state(struct pci_dev *dev)

+static void pci_update_current_state(struct pci_dev *dev, pci_power_t state)

{

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

+ } else {

+ dev->current_state = state;

}

}

@@ -574,7 +577,7 @@ int pci_set_power_state(struct pci_dev *

*/

int ret = platform_pci_set_power_state(dev, PCI_D0);

if (!ret)

- pci_update_current_state(dev);

+ pci_update_current_state(dev, PCI_D0);

}

/* This device is quirked not to be put into D3, so

don't put it in D3 */

@@ -587,7 +590,7 @@ int pci_set_power_state(struct pci_dev *

/* Allow the platform to finalize the transition */

int ret = platform_pci_set_power_state(dev, state);

if (!ret) {

- pci_update_current_state(dev);

+ pci_update_current_state(dev, state);

error = 0;

}

}

_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm

[Index of Archives]     [Linux ACPI]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [CPU Freq]     [Kernel Newbies]     [Fedora Kernel]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux