PCI PM: handle PMCSR more carefully
PATCH 7/9 PCI PM: handle PMCSR more carefully
This patch changes __pci_set_power_state() such that it only modifies
the power state byte in PMCSR. Otherwise a PME event might
accidentally be cleared (when entering a state greater than D0), or PME_En might be cleared (when returning to D0) despite the device driver intending to leave it enabled in D0.
Signed-off-by Adam Belay <[email protected]>
--- pm.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/pci/pm.c +1 -15
@@ -114,23 +114,9 @@static void __pci_set_power_state (struct pci_dev *dev,pci_power_t state) {struct pci_dev_pm *pm = dev->pm; -u16 pmcsr; - -pci_read_config_word (dev, pm->pm_offset +PCI_PM_CTRL , &pmcsr); - -/* If we're (effectively) in D3, force entire word to 0. -* This doesn't affect PME_Status, disables PME_En, and -* sets PowerState to 0. -*/ -if (dev->current_state ==PCI_D3 ) { - pmcsr =0 ; - }else { - pmcsr &= ~PCI_PM_CTRL_STATE_MASK ; - pmcsr |= state; - }/* enter specified state */ -pci_write_config_word (dev, pm->pm_offset +PCI_PM_CTRL , pmcsr); +pci_write_config_byte (dev, pm->pm_offset +PCI_PM_CTRL , state);/* Mandatory power management transition delays */ /* see PCI PM 1.1 5.6.1 table 18 */