Commit ddb7c9d2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

PCI PM: Fix handling of devices without drivers 

Suspend to RAM is reported to break on some machines as a result of
attempting to put one of driverless PCI devices into a low power
state.  Avoid that by not attepmting to power manage driverless
devices during suspend.

Fix up pci_pm_poweroff() after a previous incomplete fix for the same
thing during hibernation.

This patch is reported to fix the regression from 2.6.28 tracked as
http://bugzilla.kernel.org/show_bug.cgi?id=12605



Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reported-and-tested-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 97c44836

drivers/pci/pci-driver.c

+12 −15
Original line number Original line Diff line number Diff line
@@ -445,11 +445,11 @@ static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev) 
	pci_save_state(pci_dev);

	pci_save_state(pci_dev);

}

}





static void pci_pm_default_suspend(struct pci_dev *pci_dev)

static void pci_pm_default_suspend(struct pci_dev *pci_dev, bool prepare)

{

{

	pci_pm_default_suspend_generic(pci_dev);

	pci_pm_default_suspend_generic(pci_dev);





	if (!pci_is_bridge(pci_dev))

	if (prepare && !pci_is_bridge(pci_dev))

		pci_prepare_to_sleep(pci_dev);

		pci_prepare_to_sleep(pci_dev);





	pci_fixup_device(pci_fixup_suspend, pci_dev);

	pci_fixup_device(pci_fixup_suspend, pci_dev);
@@ -497,19 +497,19 @@ static void pci_pm_complete(struct device *dev) 
static int pci_pm_suspend(struct device *dev)

static int pci_pm_suspend(struct device *dev)

{

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct device_driver *drv = dev->driver;

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;

	int error = 0;





	if (pci_has_legacy_pm_support(pci_dev))

	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend(dev, PMSG_SUSPEND);

		return pci_legacy_suspend(dev, PMSG_SUSPEND);





	if (drv && drv->pm && drv->pm->suspend) {

	if (pm && pm->suspend) {

		error = drv->pm->suspend(dev);

		error = pm->suspend(dev);

		suspend_report_result(drv->pm->suspend, error);

		suspend_report_result(pm->suspend, error);

	}

	}





	if (!error)

	if (!error)

		pci_pm_default_suspend(pci_dev);

		pci_pm_default_suspend(pci_dev, !!pm);





	return error;

	return error;

}

}
@@ -663,22 +663,19 @@ static int pci_pm_thaw(struct device *dev) 
static int pci_pm_poweroff(struct device *dev)

static int pci_pm_poweroff(struct device *dev)

{

{

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct device_driver *drv = dev->driver;

	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;

	int error = 0;





	if (pci_has_legacy_pm_support(pci_dev))

	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_suspend(dev, PMSG_HIBERNATE);

		return pci_legacy_suspend(dev, PMSG_HIBERNATE);





	if (!drv || !drv->pm)

	if (pm && pm->poweroff) {

		return 0;

		error = pm->poweroff(dev);



		suspend_report_result(pm->poweroff, error);

	if (drv->pm->poweroff) {

		error = drv->pm->poweroff(dev);

		suspend_report_result(drv->pm->poweroff, error);

	}

	}





	if (!error)

	if (!error)

		pci_pm_default_suspend(pci_dev);

		pci_pm_default_suspend(pci_dev, !!pm);





	return error;

	return error;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE