leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Power management fix for 5.13-rc8

Browse Source 
Revert a recent PCI power management commit that causes
 initialization issues to appear on some systems.
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmDTXKUSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxplIQAKWcJATXW70BuCtU5MH5yBQhslNbTpAy
 wFgmnqYAOWQCDPhDhuMNzRz7+BjAfgrYSYkfI2QtGtOc0Eosorm4/rdyeM4fE6xY
 JHZ1UFRJmMMefg0nRloGoJ+ZuwnG0XfO/Q3hFyx81HAvd7i5oht4brHZm0LPcfl1
 TwPupAMOSBf86pXwW6J883uToyWyTfds2BqIbwzeAcwHFb2aMqsJq32WXdeixLDV
 zSyCaHkbIk+p9Kmev6UTwA1MTwoJdWYiD6zfTsJJfrxYVtz2Tw4N3HS3tpuUP8vj
 pXJA802DjEylrtCPaRUV4m864qXZ/piKA7oYQe/do4SGy2g7RMVfh6IQ4vdDuZH0
 PBQQcKUzEmdKQDR6EL+ATa2Jt4CHsEKF2GaLr5IfCkxrtmHebowXcOy8tOhgFTqm
 +vGskotkkZXWL35ge8Lb418v7Q6qS4bECGg+G7sLr9iMQH5KuQnbzccx5nxv903d
 a/aDGM/lMIYcl0b0JIcEhZZimzENEK6PY88PKnErNak0D6XSSrMvtn1/qTDoW5pJ
 9zYBZsJtqVpjZ9lcXK1tlLVRoewP3v5Ysw/BCs7P8vO+J0AcUc9W5dk2b2xbzbBg
 Oy3jPB/u+/6yHW7NuLQognipHpP9YU9S6w9kR5fSwwcfN4oxV84o4nvGVJQKBQwI
 TComKnDUtWU6
 =x9q+
 -----END PGP SIGNATURE-----

Merge tag 'pm-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Revert a recent PCI power management commit that causes initialization
  issues to appear on some systems"

* tag 'pm-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "PCI: PM: Do not read power state in pci_enable_device_flags()"
This commit is contained in:
Linus Torvalds 2021-06-23 09:40:55 -07:00
commit 7266f2030e
1 changed files with 13 additions and 3 deletions

16
drivers/pci/pci.c
View File

@ -1900,11 +1900,21 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
int err;
int i, bars = 0;
if (atomic_inc_return(&dev->enable_cnt) > 1) {
pci_update_current_state(dev, dev->current_state);
return 0; /* already enabled */
/*
* Power state could be unknown at this point, either due to a fresh
* boot or a device removal call. So get the current power state
* so that things like MSI message writing will behave as expected
* (e.g. if the device really is in D0 at enable time).
*/
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);
}
if (atomic_inc_return(&dev->enable_cnt) > 1)
return 0; /* already enabled */
bridge = pci_upstream_bridge(dev);
if (bridge)
pci_enable_bridge(bridge);