PCI/PM: Do not generate wakeup event when runtime resuming bus
Subsystems (4)
PATCH v2 1/2 PCI/PM: Do not generate wakeup event when runtime resuming bus
When a PCI bridge is runtime resumed from D3cold the underlying bus is walked and the attached devices are runtime resumed as well. However, in addition to that we also generate a wakeup event for these devices even though this actually is not a real wakeup event coming from the hardware.
Normally this does not cause problems but when combined with /sys/power/wakeup_count like using the steps below:
# count=$(cat /sys/power/wakeup_count)
# echo $count > /sys/power/wakeup_count # echo mem > /sys/power/state
The system suspend cycle might fail at this point if a PCI bridge that was runtime suspended (D3cold) was runtime resumed for any reason. The runtime resume calls pci_wakeup_bus() and that generates wakeup event increasing wakeup_count.
Since this is not a real wakeup event we can prevent the above from happening by removing the call to pci_wakeup_event() in pci_wakeup_bus().
---
Previous version can be found here:
https://www.spinics.net/lists/linux-pci/msg101083.html
Changes from the previous version:
- Split the patch in two. The second patch only does the rename.
- Tried to improve the commit message a bit
- Added Rafael's reviewed-by tag
drivers/pci/pci.c | 1 - 1 file changed, 1 deletion(-)
drivers/pci/pci.c +0 -1
@@ -1181,7 +1181,6 @@ EXPORT_SYMBOL_GPL(pci_platform_power_transition);*/ static int pci_wakeup (struct pci_dev *pci_dev,void *ign) { -pci_wakeup_event (pci_dev);pm_request_resume (&pci_dev->dev);return 0 ; }
Signature · 1 line
2.29.2
PATCH v2 2/2 PCI: Rename pci_wakeup_bus() to pci_resume_bus()
The previous commit changed the pci_wakeup_bus() to not to signal wakeup event anymore so rename the function to better match what it does.
---
This is new patch as suggested by Bjorn. This one only does the rename. I added Rafael's tag here too as there are no other changes than the split. Let me know if it's not OK.
drivers/gpu/vga/vga_switcheroo.c | 2 +- drivers/pci/pci.c | 15 +++++---------- include/linux/pci.h | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-)
drivers/gpu/vga/vga_switcheroo.c +1 -1
@@ -1039,7 +1039,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)mutex_lock (&vgasr_mutex);vga_switcheroo_power_switch (pdev,VGA_SWITCHEROO_ON );mutex_unlock (&vgasr_mutex); -pci_wakeup_bus (pdev->bus); +pci_resume_bus (pdev->bus); ret = dev->bus->pm->runtime_resume (dev);if (ret)return ret;
drivers/pci/pci.c +5 -10
@@ -1174,25 +1174,20 @@ int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state) }EXPORT_SYMBOL_GPL (pci_platform_power_transition); -/** -* pci_wakeup - Wake up a PCI device -* @pci_dev: Device to handle. -* @ign: ignored parameter -*/ -static int pci_wakeup (struct pci_dev *pci_dev,void *ign) +static int pci_resume_one (struct pci_dev *pci_dev,void *ign) {pm_request_resume (&pci_dev->dev);return 0 ; }/** -* pci_wakeup_bus - Walk given bus and wake up devices on it +* pci_resume_bus - Walk given bus and runtime resume devices on it * @bus: Top bus of the subtree to walk. */ -void pci_wakeup_bus (struct pci_bus *bus) +void pci_resume_bus (struct pci_bus *bus) {if (bus) -pci_walk_bus (bus, pci_wakeup,NULL ); +pci_walk_bus (bus, pci_resume_one,NULL ); }static int pci_dev_wait (struct pci_dev *dev,char *reset_type,int timeout)
@@ -1255,7 +1250,7 @@ int pci_power_up(struct pci_dev *dev)* may be powered on into D0uninitialized state, resume them to * give them a chance to suspend again */ -pci_wakeup_bus (dev->subordinate); +pci_resume_bus (dev->subordinate); }return pci_raw_set_power_state (dev,PCI_D0 );
include/linux/pci.h +1 -1
@@ -1271,7 +1271,7 @@ bool pci_dev_run_wake(struct pci_dev *dev);void pci_d3cold_enable (struct pci_dev *dev);void pci_d3cold_disable (struct pci_dev *dev);bool pcie_relaxed_ordering_enabled (struct pci_dev *dev); -void pci_wakeup_bus (struct pci_bus *bus); +void pci_resume_bus (struct pci_bus *bus);void pci_bus_set_current_state (struct pci_bus *bus,pci_power_t state);/* For use by arch with custom probe code */
Signature · 1 line
2.29.2
Quoted 18 lines · Mika Westerberg
When a PCI bridge is runtime resumed from D3cold the underlying bus is walked and the attached devices are runtime resumed as well. However, in addition to that we also generate a wakeup event for these devices even though this actually is not a real wakeup event coming from the hardware.
Normally this does not cause problems but when combined with
/sys/power/wakeup_countlike using the steps below:# count=$(cat
/sys/power/wakeup_count)# echo $count > /sys/power/wakeup_count # echo mem > /sys/power/stateThe system suspend cycle might fail at this point if a PCI bridge that was runtime suspended (D3cold) was runtime resumed for any reason. The runtime resume calls
pci_wakeup_bus()and that generates wakeup event increasingwakeup_count.
Quoted 7 lines
Since this is not a real wakeup event we can prevent the above from happening by removing the call to
pci_wakeup_event()inpci_wakeup_bus().Reported-by Utkarsh Patel <[email protected]>Signed-off-by Mika Westerberg <[email protected]>Reviewed-by Rafael J. Wysocki <[email protected]>
I reversed the order of these since I think it's more obvious that pci_wakeup_event() doesn't fit in pci_resume_one() and applied both to pci/pm for v5.11, thanks!
Quoted 29 lines
---
Previous version can be found here:https://www.spinics.net/lists/linux-pci/msg101083.html
Changes from the previous version:
- Split the patch in two. The second patch only does the rename.
- Tried to improve the commit message a bit
- Added Rafael's reviewed-by tagdrivers/pci/pci.c | 1 - 1 file changed, 1 deletion(-)drivers/pci/pci.c +0
-1@@ -1181,7 +1181,6 @@ EXPORT_SYMBOL_GPL(pci_platform_power_transition);*/ static int pci_wakeup (struct pci_dev *pci_dev,void *ign) { -pci_wakeup_event (pci_dev);pm_request_resume (&pci_dev->dev);return 0 ; }Signature · 1 line
2.29.2