mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

PCI/PM: Write 0 to PMCSR in pci_power_up() in all cases

Browse source 
Make pci_power_up() write 0 to the device's PCI_PM_CTRL register in
order to put it into D0 regardless of the power state returned by
the previous read from that register which should not matter.

Link: https://lore.kernel.org/r/5748066.MhkbZ0Pkbq@kreacher
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Rafael J. Wysocki 2022-05-05 20:10:43 +02:00 committed by Bjorn Helgaas
parent 0b59193548
commit f0881d38c7
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/pci/pci.c
View file

@ -1230,15 +1230,10 @@ int pci_power_up(struct pci_dev *dev)
}
/*
* 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.
* Force the entire word to 0. This doesn't affect PME_Status, disables
* PME_En, and sets PowerState to 0.
*/
if (state == PCI_D3hot)
pmcsr = 0;
else
pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr);
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, 0);
/* Mandatory transition delays; see PCI PM 1.2. */
if (state == PCI_D3hot)