From: Imre Deak <imre.deak@intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Jani Nikula <jani.nikula@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Linux PM <linux-pm@vger.kernel.org>,
intel-gfx@lists.freedesktop.org,
Linux PCI <linux-pci@vger.kernel.org>
Subject: [PATCH v3] PCI / PM: tune down RPM suspend error message with EBUSY and EAGAIN retval
Date: Fri, 27 Nov 2015 20:17:34 +0200 [thread overview]
Message-ID: <1448648254-12639-1-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1447844188-21999-1-git-send-email-imre.deak@intel.com>
The runtime PM core doesn't treat EBUSY and EAGAIN retvals from the driver
suspend hooks as errors, but they still show up as errors in dmesg. Tune
them down.
One problem caused by this was noticed by Daniel: the i915 driver
returns EAGAIN to signal a temporary failure to suspend and as a request
towards the RPM core for scheduling a suspend again. This is a normal
event, but the resulting error message flags a breakage during the
driver's automated testing which parses dmesg and picks up the error.
v2:
- fix compile breake when CONFIG_PM_SLEEP=n (0-day builder)
v3:
- instead of modifying the suspend_report_result() helper to disinguish
between the runtime and system suspend case, inline the error
printing, it's not used anywhere else (Rafael)
Reported-by: Daniel Vetter <daniel.vetter@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92992
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/pci/pci-driver.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 4446fcb..67eb4ac 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1146,9 +1146,20 @@ static int pci_pm_runtime_suspend(struct device *dev)
pci_dev->state_saved = false;
pci_dev->no_d3cold = false;
error = pm->runtime_suspend(dev);
- suspend_report_result(pm->runtime_suspend, error);
- if (error)
+ if (error) {
+ /*
+ * -EBUSY and -EAGAIN is used to request the runtime PM core
+ * to schedule a new suspend, so don't flag it as an error.
+ */
+ if (error == -EBUSY || error == -EAGAIN)
+ printk(KERN_DEBUG "%s(): %pF returns %d\n", __func__,
+ pm->runtime_suspend, error);
+ else
+ printk(KERN_ERR "%s(): %pF returns %d\n", __func__,
+ pm->runtime_suspend, error);
+
return error;
+ }
if (!pci_dev->d3cold_allowed)
pci_dev->no_d3cold = true;
--
2.5.0
next prev parent reply other threads:[~2015-11-27 18:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1447838178-15308-1-git-send-email-imre.deak@intel.com>
[not found] ` <1447844188-21999-1-git-send-email-imre.deak@intel.com>
[not found] ` <1447853318.14073.2.camel@intel.com>
[not found] ` <20151118141943.GU20799@phenom.ffwll.local>
[not found] ` <878u5j7jt9.fsf@intel.com>
2015-11-27 14:44 ` [Intel-gfx] [PATCH v2] PCI / PM: tune down RPM suspend error message with EBUSY and EAGAIN retval Rafael J. Wysocki
2015-11-27 14:56 ` Imre Deak
2015-11-27 18:17 ` Imre Deak [this message]
2015-11-27 22:23 ` [PATCH v3] " Rafael J. Wysocki
2015-11-28 8:34 ` [PATCH v4] " Imre Deak
2015-11-30 2:07 ` Rafael J. Wysocki
2015-11-30 18:07 ` Bjorn Helgaas
2015-11-30 19:02 ` [PATCH v5] PCI / PM: Tune down retryable runtime suspend error messages Imre Deak
2015-12-02 1:54 ` Rafael J. Wysocki
2015-12-02 4:43 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448648254-12639-1-git-send-email-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=bhelgaas@google.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).