| Summary: | [BAT][IVB] Suspend tests fail due to e1000 driver failing to suspend | ||
|---|---|---|---|
| Product: | DRI | Reporter: | Tvrtko Ursulin <tvrtko.ursulin> |
| Component: | DRM/Intel | Assignee: | Intel GFX Bugs mailing list <intel-gfx-bugs> |
| Status: | CLOSED NOTOURBUG | QA Contact: | Intel GFX Bugs mailing list <intel-gfx-bugs> |
| Severity: | normal | ||
| Priority: | medium | CC: | intel-gfx-bugs, jani.saarinen |
| Version: | DRI git | ||
| Hardware: | Other | ||
| OS: | All | ||
| Whiteboard: | |||
| i915 platform: | IVB | i915 features: | power/suspend-resume |
|
Description
Tvrtko Ursulin
2017-02-17 11:38:45 UTC
Note it was an error during an earlier e1000 suspend that triggered the later failure: [ 429.994338] ACPI : EC: event blocked [ 429.994633] e1000e: EEE TX LPI TIMER: 00000011 [ 430.955451] pci_pm_suspend(): e1000e_pm_suspend+0x0/0x30 [e1000e] returns -2 [ 430.955454] dpm_run_callback(): pci_pm_suspend+0x0/0x140 returns -2 [ 430.955458] PM: Device 0000:00:19.0 failed to suspend async: error -2 [ 430.955581] PM: Some devices failed to suspend, or early wake event detected [ 430.957709] ACPI : EC: event unblocked diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index eccf1da9356b..429a5210230d 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6615,12 +6615,19 @@ static int e1000e_pm_thaw(struct device *dev)
static int e1000e_pm_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
+ int rc;
e1000e_flush_lpic(pdev);
e1000e_pm_freeze(dev);
- return __e1000_shutdown(pdev, false);
+ rc = __e1000_shutdown(pdev, false);
+ if (rc) {
+ e1000e_pm_thaw(dev);
+ return rc;
+ }
+
+ return 0;
}
static int e1000e_pm_resume(struct device *dev)
Has this been reported to the e1000 maintainers? They won't hang out at fdo bugzilla looking at DRM/Intel bugs... topic/core-for-CI commit ce3000be4f666479e49a4e844bda2a469b0bbb4d Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Feb 17 12:30:51 2017 +0000 e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails Got a response from e1000e maintainer - believe upstream fix in progress. Should we wait real fix or whitelist now on CI? Based on IRC discussion I will close now and whitelist on CI. *** Bug 100114 has been marked as a duplicate of this bug. *** |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.