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

Commit 035ee288 authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas
Browse files

PCI: Fix bridge_d3 update on device removal 



Starting with v4.8, we allow a PCIe port to runtime suspend to D3hot if the
port itself and its children satisfy a number of conditions.  Once a child
is removed, we recheck those conditions in case the removed device was
blocking the port from suspending.

The rechecking needs to happen *after* the device has been removed from the
bus it resides on.  Otherwise when walking the port's subordinate bus in
pci_bridge_d3_update(), the device being removed would erroneously still be
taken into account.

However the device is removed from the bus_list in pci_destroy_dev() and we
currently recheck *before* that.  Fix it.

Fixes: 9d26d3a8 ("PCI: Put PCIe ports into D3 during suspend")
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <mika.westerberg@linux.intel.com>
parent 6af7e4f7

drivers/pci/remove.c

+1 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static void pci_destroy_dev(struct pci_dev *dev) 
	list_del(&dev->bus_list);

	up_write(&pci_bus_sem);



	pci_bridge_d3_device_removed(dev);

	pci_free_resources(dev);

	put_device(&dev->dev);

}
@@ -96,8 +97,6 @@ static void pci_remove_bus_device(struct pci_dev *dev) 
		dev->subordinate = NULL;

	}



	pci_bridge_d3_device_removed(dev);



	pci_destroy_dev(dev);

}