Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b96088 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-pci' 

Merge a PCI power management regression fix.

* pm-pci:
  PCI / ACPI / PM: Resume bridges w/o drivers on suspend-to-RAM
parents 895b6612 26112ddc

drivers/pci/pci-acpi.c

+12 −0
Original line number Diff line number Diff line
@@ -629,6 +629,18 @@ static bool acpi_pci_need_resume(struct pci_dev *dev) 
{

	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);



	/*

	 * In some cases (eg. Samsung 305V4A) leaving a bridge in suspend over

	 * system-wide suspend/resume confuses the platform firmware, so avoid

	 * doing that, unless the bridge has a driver that should take care of

	 * the PM handling.  According to Section 16.1.6 of ACPI 6.2, endpoint

	 * devices are expected to be in D3 before invoking the S3 entry path

	 * from the firmware, so they should not be affected by this issue.

	 */

	if (pci_is_bridge(dev) && !dev->driver &&

	    acpi_target_system_state() != ACPI_STATE_S0)

		return true;



	if (!adev || !acpi_device_power_manageable(adev))

		return false;