From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
tiwai@suse.de, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
vkoul@kernel.org, broonie@kernel.org,
srinivas.kandagatla@linaro.org, jank@cadence.com,
slawomir.blauciak@intel.com,
Sanyog Kale <sanyog.r.kale@intel.com>,
Bard liao <yung-chuan.liao@linux.intel.com>,
Rander Wang <rander.wang@linux.intel.com>
Subject: [alsa-devel] [PATCH v3 22/22] soundwire: intel: pm_runtime idle scheduling
Date: Thu, 14 Nov 2019 12:17:02 -0600 [thread overview]
Message-ID: <20191114181702.22254-23-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191114181702.22254-1-pierre-louis.bossart@linux.intel.com>
Add quirk and pm_runtime idle scheduling to let the Master suspend if
no Slaves become attached. This can happen when a link is not marked
as disabled and has devices exposed in the DSDT, if the power is
controlled by sideband means or the link includes a pluggable
connector.
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/intel.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index b114e9a72fdc..f0077f58c4bf 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -29,8 +29,9 @@
* flags reused in each byte, with master0 using the ls-byte, etc.
*/
-#define SDW_INTEL_MASTER_DISABLE_PM_RUNTIME BIT(0)
-#define SDW_INTEL_MASTER_DISABLE_CLOCK_STOP BIT(1)
+#define SDW_INTEL_MASTER_DISABLE_PM_RUNTIME BIT(0)
+#define SDW_INTEL_MASTER_DISABLE_CLOCK_STOP BIT(1)
+#define SDW_INTEL_MASTER_DISABLE_PM_RUNTIME_IDLE BIT(2)
static int md_flags;
module_param_named(sdw_md_flags, md_flags, int, 0444);
@@ -1329,6 +1330,22 @@ static int intel_master_startup(struct sdw_master_device *md)
pm_runtime_enable(&md->dev);
}
+ /*
+ * Slave devices have an pm_runtime of 'Unsupported' until
+ * they report as ATTACHED. If they don't, e.g. because there
+ * are no Slave devices populated or if the power-on is
+ * delayed or dependent on a power switch, the Master will
+ * remain active and prevent its parent from suspending.
+ *
+ * Conditionally force the pm_runtime core to re-evaluate the
+ * Master status in the absence of any Slave activity. A quirk
+ * is provided to e.g. deal with Slaves that may be powered on
+ * with a delay. A more complete solution would require the
+ * definition of Master properties.
+ */
+ if (!(link_flags & SDW_INTEL_MASTER_DISABLE_PM_RUNTIME_IDLE))
+ pm_runtime_idle(&md->dev);
+
return 0;
err_interrupt:
@@ -1443,6 +1460,7 @@ static int intel_resume(struct device *dev)
struct sdw_master_device *md = to_sdw_master_device(dev);
struct sdw_cdns *cdns = dev_get_drvdata(dev);
struct sdw_intel *sdw = cdns_to_intel(cdns);
+ int link_flags;
int ret;
if (cdns->bus.prop.hw_disabled) {
@@ -1463,6 +1481,10 @@ static int intel_resume(struct device *dev)
pm_runtime_enable(dev);
md->pm_runtime_suspended = false;
+
+ link_flags = md_flags >> (sdw->cdns.bus.link_id * 8);
+ if (!(link_flags & SDW_INTEL_MASTER_DISABLE_PM_RUNTIME_IDLE))
+ pm_runtime_idle(&md->dev);
}
ret = intel_init(sdw);
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
prev parent reply other threads:[~2019-11-14 18:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 18:16 [alsa-devel] [PATCH v3 00/22] soundwire: code hardening and suspend-resume support Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 01/22] soundwire: intel/cadence: fix timeouts in MSI mode Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 02/22] soundwire: bus: fix race condition with probe_complete signaling Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 03/22] soundwire: bus: add PM/no-PM versions of read/write functions Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 04/22] soundwire: bus: write Slave Device Number without runtime_pm Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 05/22] soundwire: intel: add helpers for link power down and shim wake Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 06/22] soundwire: intel: Add basic power management support Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 07/22] soundwire: intel: add pm_runtime support Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 08/22] soundwire: intel: reset pm_runtime status during system resume Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 09/22] soundwire: bus: add helper to reset Slave status to UNATTACHED Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 10/22] soundwire: intel: call helper to reset Slave states on resume Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 11/22] soundwire: bus: check first if Slaves become UNATTACHED Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 12/22] soundwire: bus: fix race condition with enumeration_complete signaling Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 13/22] soundwire: bus: fix race condition with initialization_complete signaling Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 14/22] soundwire: bus: fix race condition by tracking UNATTACHED transition Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 15/22] soundwire: intel: disable pm_runtime when removing a master Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 16/22] soundwire: bus: disable pm_runtime in sdw_slave_delete Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 17/22] soundwire: stream: remove redundant pr_err traces Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 18/22] soundwire: stream: update state machine and add state checks Pierre-Louis Bossart
2019-11-14 18:16 ` [alsa-devel] [PATCH v3 19/22] soundwire: stream: only prepare stream when it is configured Pierre-Louis Bossart
2019-11-14 18:17 ` [alsa-devel] [PATCH v3 20/22] soundwire: stream: do not update parameters during DISABLED-PREPARED transition Pierre-Louis Bossart
2019-11-14 18:17 ` [alsa-devel] [PATCH v3 21/22] soundwire: intel: reinitialize IP+DSP in .prepare(), but only when resuming Pierre-Louis Bossart
2019-11-14 18:17 ` Pierre-Louis Bossart [this message]
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=20191114181702.22254-23-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.com \
/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).