From: Vinod Koul <vkoul@kernel.org>
To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: alsa-devel@alsa-project.org, tiwai@suse.de,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
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: Re: [alsa-devel] [PATCH 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback
Date: Tue, 14 Jan 2020 11:44:41 +0530 [thread overview]
Message-ID: <20200114061441.GB2818@vkoul-mobl> (raw)
In-Reply-To: <20200110214609.30356-5-pierre-louis.bossart@linux.intel.com>
On 10-01-20, 15:46, Pierre-Louis Bossart wrote:
> From: Rander Wang <rander.wang@linux.intel.com>
>
> The sdw stream is allocated and stored in dai to share the sdw runtime
> information.
>
> 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 | 65 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 65 insertions(+)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index aa80c46156cb..f4554386d832 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -617,6 +617,69 @@ static int intel_post_bank_switch(struct sdw_bus *bus)
> * DAI routines
> */
>
> +static int sdw_stream_setup(struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct snd_soc_pcm_runtime *rtd = substream->private_data;
> + struct sdw_stream_runtime *sdw_stream = NULL;
> + char *name;
> + int i, ret;
> +
> + name = kzalloc(32, GFP_KERNEL);
> + if (!name)
> + return -ENOMEM;
> +
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + snprintf(name, 32, "%s-Playback", dai->name);
> + else
> + snprintf(name, 32, "%s-Capture", dai->name);
How about use DAI_SIZE instead of 32 here and above few places? Lets not
code number like this please
> +
> + sdw_stream = sdw_alloc_stream(name);
> + if (!sdw_stream) {
> + dev_err(dai->dev, "alloc stream failed for DAI %s", dai->name);
> + ret = -ENOMEM;
> + goto error;
> + }
> +
> + /* Set stream pointer on CPU DAI */
> + ret = snd_soc_dai_set_sdw_stream(dai, sdw_stream, substream->stream);
> + if (ret < 0) {
> + dev_err(dai->dev, "failed to set stream pointer on cpu dai %s",
> + dai->name);
> + goto release_stream;
> + }
> +
> + /* Set stream pointer on all CODEC DAIs */
> + for (i = 0; i < rtd->num_codecs; i++) {
> + ret = snd_soc_dai_set_sdw_stream(rtd->codec_dais[i], sdw_stream,
> + substream->stream);
> + if (ret < 0) {
> + dev_err(dai->dev, "failed to set stream pointer on codec dai %s",
> + rtd->codec_dais[i]->name);
> + goto release_stream;
> + }
> + }
> +
> + return 0;
> +
> +release_stream:
> + sdw_release_stream(sdw_stream);
> +error:
> + kfree(name);
> + return ret;
> +}
> +
> +static int intel_startup(struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + /*
> + * TODO: add pm_runtime support here, the startup callback
> + * will make sure the IP is 'active'
> + */
> +
> + return sdw_stream_setup(substream, dai);
> +}
> +
> static int intel_hw_params(struct snd_pcm_substream *substream,
> struct snd_pcm_hw_params *params,
> struct snd_soc_dai *dai)
> @@ -796,6 +859,7 @@ static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai,
> }
>
> static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
> + .startup = intel_startup,
> .hw_params = intel_hw_params,
> .prepare = intel_prepare,
> .trigger = intel_trigger,
> @@ -805,6 +869,7 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
> };
>
> static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
> + .startup = intel_startup,
> .hw_params = intel_hw_params,
> .prepare = intel_prepare,
> .trigger = intel_trigger,
> --
> 2.20.1
--
~Vinod
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2020-01-14 13:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 21:46 [alsa-devel] [PATCH 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
2020-01-10 21:46 ` [alsa-devel] [PATCH 1/5] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2020-01-10 21:46 ` [alsa-devel] [PATCH 2/5] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
2020-01-10 21:46 ` [alsa-devel] [PATCH 3/5] soundwire: intel: add trigger " Pierre-Louis Bossart
2020-01-10 21:46 ` [alsa-devel] [PATCH 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
2020-01-14 6:14 ` Vinod Koul [this message]
2020-01-14 18:55 ` Pierre-Louis Bossart
2020-01-10 21:46 ` [alsa-devel] [PATCH 5/5] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
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=20200114061441.GB2818@vkoul-mobl \
--to=vkoul@kernel.org \
--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=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=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--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).