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

Commit 87683e22 authored by Oliver Neukum's avatar Oliver Neukum Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Always implement resume, regardless of pciehp_force param 



Previously, the driver ignored resume unless the pciehp_force module_param
was specified.  On some laptops that means that interrupts are not
delivered after S3, so card removals and insertions are not handled.
This patch makes the driver handle resume regardless of pciehp_force.

[bhelgaas: changelog]
Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 0d7614f0

drivers/pci/hotplug/pciehp_core.c

+14 −14
Original line number Diff line number Diff line
@@ -300,12 +300,13 @@ static int pciehp_suspend (struct pcie_device *dev) 


static int pciehp_resume (struct pcie_device *dev)

{

	dev_info(&dev->device, "%s ENTRY\n", __func__);

	if (pciehp_force) {

		struct controller *ctrl = get_service_data(dev);

	struct controller *ctrl;

	struct slot *slot;

	u8 status;



	dev_info(&dev->device, "%s ENTRY\n", __func__);

	ctrl = get_service_data(dev);



	/* reinitialize the chipset's event detection logic */

	pcie_enable_notification(ctrl);
@@ -317,7 +318,6 @@ static int pciehp_resume (struct pcie_device *dev) 
		pciehp_enable_slot(slot);

	else

		pciehp_disable_slot(slot);

	}

	return 0;

}

#endif /* PM */