Skip to content

Commit 26112dd

Browse files
committed
PCI / ACPI / PM: Resume bridges w/o drivers on suspend-to-RAM
It is reported that commit c62ec46 (PM / core: Fix direct_complete handling for devices with no callbacks) introduced a system suspend regression on Samsung 305V4A by allowing a PCI bridge (not a PCIe port) to stay in D3 over suspend-to-RAM, which is a side effect of setting power.direct_complete for the children of that bridge that have no PM callbacks. On the majority of systems PCI bridges are not allowed to be runtime-suspended (the power/control sysfs attribute is set to "on" for them by default), but user space can change that setting and if it does so and a given bridge has no children with PM callbacks, the direct_complete optimization will be applied to it and it will stay in suspend over system suspend. Apparently, that confuses the platform firmware on the affected machine and that may very well happen elsewhere, so avoid the direct_complete optimization for PCI bridges with no drivers (if there is a driver, it should take care of the PM handling) on suspend-to-RAM altogether (that should not matter for suspend-to-idle as platform firmware is not involved in it). Fixes: c62ec46 (PM / core: Fix direct_complete handling for devices with no callbacks) Link: https://bugzilla.kernel.org/show_bug.cgi?id=199941 Reported-by: [email protected] Tested-by: [email protected] Reviewed-by: Mika Westerberg <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> Cc: 4.15+ <[email protected]> # 4.15+ Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 7daf201 commit 26112dd

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/pci/pci-acpi.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,18 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
629629
{
630630
struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
631631

632+
/*
633+
* In some cases (eg. Samsung 305V4A) leaving a bridge in suspend over
634+
* system-wide suspend/resume confuses the platform firmware, so avoid
635+
* doing that, unless the bridge has a driver that should take care of
636+
* the PM handling. According to Section 16.1.6 of ACPI 6.2, endpoint
637+
* devices are expected to be in D3 before invoking the S3 entry path
638+
* from the firmware, so they should not be affected by this issue.
639+
*/
640+
if (pci_is_bridge(dev) && !dev->driver &&
641+
acpi_target_system_state() != ACPI_STATE_S0)
642+
return true;
643+
632644
if (!adev || !acpi_device_power_manageable(adev))
633645
return false;
634646

0 commit comments

Comments
 (0)