From: Imre Deak <imre.deak@intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jani Nikula <jani.nikula@intel.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
linux-pci@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH v5 1/2] PCI / PM: Add needs_resume flag to avoid suspend complete optimization
Date: Thu, 4 May 2017 12:48:35 +0300 [thread overview]
Message-ID: <1493891315-11867-1-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1493726649-32094-1-git-send-email-imre.deak@intel.com>
Some drivers - like i915 - may not support the system suspend direct
complete optimization due to differences in their runtime and system
suspend sequence. Add a flag that when set resumes the device before
calling the driver's system suspend handlers which effectively disables
the optimization.
Needed by the next patch fixing suspend/resume on i915.
Suggested by Rafael.
v2-v3:
- unchanged
v4:
- Move the flag to dev_flags instead of using a bit field. (Rafael)
v5:
- Rebase on pci/next branch using the free next enum number available.
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Imre Deak <imre.deak@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
[ Bjorn, could you apply this one patch to the pci tree? We would merge
the second patch via the drm-tip tree once this one shows up in Linus'
tree. ]
---
drivers/pci/pci.c | 3 ++-
include/linux/pci.h | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b01bd5b..563901c 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2144,7 +2144,8 @@ bool pci_dev_keep_suspended(struct pci_dev *pci_dev)
if (!pm_runtime_suspended(dev)
|| pci_target_state(pci_dev) != pci_dev->current_state
- || platform_pci_need_resume(pci_dev))
+ || platform_pci_need_resume(pci_dev)
+ || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME))
return false;
/*
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 88185ff..ce82b60 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -183,6 +183,11 @@ enum pci_dev_flags {
PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
/* Do not use FLR even if device advertises PCI_AF_CAP */
PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
+ /*
+ * Resume before calling the driver's system suspend hooks, disabling
+ * the direct_complete optimization.
+ */
+ PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11),
};
enum pci_irq_reroute_variant {
--
2.7.4
next prev parent reply other threads:[~2017-05-04 9:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 12:04 [PATCH v4 1/2] PCI / PM: Add needs_resume flag to avoid suspend complete optimization Imre Deak
2017-05-02 12:04 ` [PATCH v4 2/2] drm/i915: Prevent the system " Imre Deak
2017-05-02 12:04 ` Imre Deak
2017-05-02 16:51 ` [Intel-gfx] " Daniel Vetter
2017-05-02 16:51 ` Daniel Vetter
2017-05-02 17:02 ` Imre Deak
2017-05-02 17:02 ` Imre Deak
2017-05-02 17:02 ` [Intel-gfx] " Imre Deak
2017-05-02 13:21 ` ✗ Fi.CI.BAT: failure for series starting with [v4,1/2] PCI / PM: Add needs_resume flag to avoid " Patchwork
2017-05-02 13:50 ` Imre Deak
2017-05-02 15:10 ` ✗ Fi.CI.BAT: warning " Patchwork
2017-05-02 16:28 ` Imre Deak
2017-05-03 13:39 ` Imre Deak
2017-05-02 15:27 ` ✓ Fi.CI.BAT: success " Patchwork
2017-05-03 8:41 ` Imre Deak
2017-05-04 5:48 ` Lofstedt, Marta
2017-05-31 14:07 ` Imre Deak
2017-05-02 21:04 ` [PATCH v4 1/2] " Rafael J. Wysocki
2017-05-04 9:48 ` Imre Deak [this message]
2017-05-23 19:20 ` [PATCH v5 " Bjorn Helgaas
2017-05-16 9:22 Imre Deak
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=1493891315-11867-1-git-send-email-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=bhelgaas@google.com \
--cc=jani.nikula@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.