From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: pierre-louis.bossart@linux.intel.com, vinod.koul@linaro.org,
tiwai@suse.de, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, ranjani.sridharan@linux.intel.com,
hui.wang@canonical.com, broonie@kernel.org,
srinivas.kandagatla@linaro.org, jank@cadence.com,
mengdong.lin@intel.com, sanyog.r.kale@intel.com,
rander.wang@linux.intel.com, bard.liao@intel.com
Subject: [PATCH 07/11] soundwire: intel: Only call sdw stream APIs for the first cpu_dai
Date: Tue, 18 Aug 2020 10:41:16 +0800 [thread overview]
Message-ID: <20200818024120.20721-8-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20200818024120.20721-1-yung-chuan.liao@linux.intel.com>
We should call these APIs once per stream. So we can only call it
when the dai ops is invoked for the first cpu dai.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
drivers/soundwire/intel.c | 45 +++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 89a8ad1f80e8..7c63581270fd 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -941,11 +941,13 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
static int intel_prepare(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *first_cpu_dai = asoc_rtd_to_cpu(rtd, 0);
struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_cdns_dma_data *dma;
int ch, dir;
- int ret;
+ int ret = 0;
dma = snd_soc_dai_get_dma_data(dai, substream);
if (!dma) {
@@ -985,7 +987,13 @@ static int intel_prepare(struct snd_pcm_substream *substream,
goto err;
}
- ret = sdw_prepare_stream(dma->stream);
+ /*
+ * All cpu dais belong to a stream. To ensure sdw_prepare_stream
+ * is called once per stream, we should call it only when
+ * dai = first_cpu_dai.
+ */
+ if (first_cpu_dai == dai)
+ ret = sdw_prepare_stream(dma->stream);
err:
return ret;
@@ -994,9 +1002,19 @@ static int intel_prepare(struct snd_pcm_substream *substream,
static int intel_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai)
{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *first_cpu_dai = asoc_rtd_to_cpu(rtd, 0);
struct sdw_cdns_dma_data *dma;
int ret;
+ /*
+ * All cpu dais belong to a stream. To ensure sdw_enable/disable_stream
+ * are called once per stream, we should call them only when
+ * dai = first_cpu_dai.
+ */
+ if (first_cpu_dai != dai)
+ return 0;
+
dma = snd_soc_dai_get_dma_data(dai, substream);
if (!dma) {
dev_err(dai->dev, "failed to get dma data in %s", __func__);
@@ -1031,6 +1049,8 @@ static int intel_trigger(struct snd_pcm_substream *substream, int cmd,
static int
intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *first_cpu_dai = asoc_rtd_to_cpu(rtd, 0);
struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_cdns_dma_data *dma;
@@ -1040,12 +1060,25 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
if (!dma)
return -EIO;
- ret = sdw_deprepare_stream(dma->stream);
- if (ret) {
- dev_err(dai->dev, "sdw_deprepare_stream: failed %d", ret);
- return ret;
+ /*
+ * All cpu dais belong to a stream. To ensure sdw_deprepare_stream
+ * is called once per stream, we should call it only when
+ * dai = first_cpu_dai.
+ */
+ if (first_cpu_dai == dai) {
+ ret = sdw_deprepare_stream(dma->stream);
+ if (ret) {
+ dev_err(dai->dev, "sdw_deprepare_stream: failed %d", ret);
+ return ret;
+ }
}
+ /*
+ * The sdw stream state will transition to RELEASED when stream->
+ * master_list is empty. So the stream state will transition to
+ * DEPREPARED for the first cpu-dai and to RELEASED for the last
+ * cpu-dai.
+ */
ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
if (ret < 0) {
dev_err(dai->dev, "remove master from stream %s failed: %d\n",
--
2.17.1
next prev parent reply other threads:[~2020-08-18 14:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 2:41 [PATCH 00/11] soundwire: intel: add multi-link support Bard Liao
2020-08-18 2:41 ` [PATCH 01/11] soundwire: intel: disable shim wake on suspend Bard Liao
2020-08-18 2:41 ` [PATCH 02/11] soundwire: intel: ignore software command retries Bard Liao
2020-08-18 2:41 ` [PATCH 03/11] soundwire: intel: add multi-link support Bard Liao
2020-08-18 2:41 ` [PATCH 04/11] soundwire: intel: add missing support for all clock stop modes Bard Liao
2020-08-18 2:41 ` [PATCH 05/11] soundwire: bus: update multi-link definition with hw sync details Bard Liao
2020-08-26 9:44 ` Vinod Koul
2020-08-26 14:09 ` Pierre-Louis Bossart
2020-08-28 7:27 ` Vinod Koul
2020-08-18 2:41 ` [PATCH 06/11] soundwire: intel: add multi-link hw_synchronization information Bard Liao
2020-08-18 2:41 ` Bard Liao [this message]
2020-08-26 9:46 ` [PATCH 07/11] soundwire: intel: Only call sdw stream APIs for the first cpu_dai Vinod Koul
2020-08-26 14:35 ` Pierre-Louis Bossart
2020-08-28 7:49 ` Vinod Koul
2020-08-28 1:47 ` Liao, Bard
2020-08-28 7:45 ` Vinod Koul
2020-08-28 15:07 ` Pierre-Louis Bossart
2020-08-18 2:41 ` [PATCH 08/11] soundwire: stream: enable hw_sync as needed by hardware Bard Liao
2020-08-18 2:41 ` [PATCH 09/11] soundwire: intel: add dynamic debug trace for clock-stop invalid configs Bard Liao
2020-08-26 9:48 ` Vinod Koul
2020-08-26 14:38 ` Pierre-Louis Bossart
2020-08-28 7:49 ` Vinod Koul
2020-08-28 14:54 ` Pierre-Louis Bossart
2020-08-29 11:00 ` Vinod Koul
2020-08-31 15:15 ` Pierre-Louis Bossart
2020-09-01 11:07 ` Vinod Koul
2020-09-01 13:31 ` Pierre-Louis Bossart
2020-08-18 2:41 ` [PATCH 10/11] soundwire: intel: pass link_mask information to each master Bard Liao
2020-08-18 2:41 ` [PATCH 11/11] soundwire: intel: don't manage link power individually Bard Liao
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=20200818024120.20721-8-yung-chuan.liao@linux.intel.com \
--to=yung-chuan.liao@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hui.wang@canonical.com \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mengdong.lin@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vinod.koul@linaro.org \
--cc=vkoul@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 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).