* [PATCH v2 1/5] soundwire: intel: rename res field as link_res
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
@ 2020-01-14 23:42 ` Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 2/5] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-01-14 23:42 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Pierre-Louis Bossart, Sanyog Kale
There are too many fields called 'res' so add prefix to make it easier
to track what the structures are.
Pure rename, no functionality change
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/intel.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 06ef3a3ac080..78b2ebf0119c 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -103,7 +103,7 @@ enum intel_pdi_type {
struct sdw_intel {
struct sdw_cdns cdns;
int instance;
- struct sdw_intel_link_res *res;
+ struct sdw_intel_link_res *link_res;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs;
#endif
@@ -193,8 +193,8 @@ static ssize_t intel_sprintf(void __iomem *mem, bool l,
static int intel_reg_show(struct seq_file *s_file, void *data)
{
struct sdw_intel *sdw = s_file->private;
- void __iomem *s = sdw->res->shim;
- void __iomem *a = sdw->res->alh;
+ void __iomem *s = sdw->link_res->shim;
+ void __iomem *a = sdw->link_res->alh;
char *buf;
ssize_t ret;
int i, j;
@@ -289,7 +289,7 @@ static void intel_debugfs_exit(struct sdw_intel *sdw) {}
static int intel_link_power_up(struct sdw_intel *sdw)
{
unsigned int link_id = sdw->instance;
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
int spa_mask, cpa_mask;
int link_control, ret;
@@ -309,7 +309,7 @@ static int intel_link_power_up(struct sdw_intel *sdw)
static int intel_shim_init(struct sdw_intel *sdw)
{
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
unsigned int link_id = sdw->instance;
int sync_reg, ret;
u16 ioctl = 0, act = 0;
@@ -370,7 +370,7 @@ static int intel_shim_init(struct sdw_intel *sdw)
static void intel_pdi_init(struct sdw_intel *sdw,
struct sdw_cdns_stream_config *config)
{
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
unsigned int link_id = sdw->instance;
int pcm_cap, pdm_cap;
@@ -404,7 +404,7 @@ static void intel_pdi_init(struct sdw_intel *sdw,
static int
intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)
{
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
unsigned int link_id = sdw->instance;
int count;
@@ -476,7 +476,7 @@ static int intel_pdi_ch_update(struct sdw_intel *sdw)
static void
intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
{
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
unsigned int link_id = sdw->instance;
int pdi_conf = 0;
@@ -508,7 +508,7 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
static void
intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
{
- void __iomem *alh = sdw->res->alh;
+ void __iomem *alh = sdw->link_res->alh;
unsigned int link_id = sdw->instance;
unsigned int conf;
@@ -535,7 +535,7 @@ static int intel_params_stream(struct sdw_intel *sdw,
struct snd_pcm_hw_params *hw_params,
int link_id, int alh_stream_id)
{
- struct sdw_intel_link_res *res = sdw->res;
+ struct sdw_intel_link_res *res = sdw->link_res;
struct sdw_intel_stream_params_data params_data;
params_data.substream = substream;
@@ -558,7 +558,7 @@ static int intel_pre_bank_switch(struct sdw_bus *bus)
{
struct sdw_cdns *cdns = bus_to_cdns(bus);
struct sdw_intel *sdw = cdns_to_intel(cdns);
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
int sync_reg;
/* Write to register only for multi-link */
@@ -577,7 +577,7 @@ static int intel_post_bank_switch(struct sdw_bus *bus)
{
struct sdw_cdns *cdns = bus_to_cdns(bus);
struct sdw_intel *sdw = cdns_to_intel(cdns);
- void __iomem *shim = sdw->res->shim;
+ void __iomem *shim = sdw->link_res->shim;
int sync_reg, ret;
/* Write to register only for multi-link */
@@ -937,9 +937,9 @@ static int intel_probe(struct platform_device *pdev)
return -ENOMEM;
sdw->instance = pdev->id;
- sdw->res = dev_get_platdata(&pdev->dev);
+ sdw->link_res = dev_get_platdata(&pdev->dev);
sdw->cdns.dev = &pdev->dev;
- sdw->cdns.registers = sdw->res->registers;
+ sdw->cdns.registers = sdw->link_res->registers;
sdw->cdns.instance = sdw->instance;
sdw->cdns.msg_count = 0;
sdw->cdns.bus.dev = &pdev->dev;
@@ -979,11 +979,12 @@ static int intel_probe(struct platform_device *pdev)
intel_pdi_ch_update(sdw);
/* Acquire IRQ */
- ret = request_threaded_irq(sdw->res->irq, sdw_cdns_irq, sdw_cdns_thread,
+ ret = request_threaded_irq(sdw->link_res->irq,
+ sdw_cdns_irq, sdw_cdns_thread,
IRQF_SHARED, KBUILD_MODNAME, &sdw->cdns);
if (ret < 0) {
dev_err(sdw->cdns.dev, "unable to grab IRQ %d, disabling device\n",
- sdw->res->irq);
+ sdw->link_res->irq);
goto err_init;
}
@@ -1013,7 +1014,7 @@ static int intel_probe(struct platform_device *pdev)
err_interrupt:
sdw_cdns_enable_interrupt(&sdw->cdns, false);
- free_irq(sdw->res->irq, sdw);
+ free_irq(sdw->link_res->irq, sdw);
err_init:
sdw_delete_bus_master(&sdw->cdns.bus);
return ret;
@@ -1028,7 +1029,7 @@ static int intel_remove(struct platform_device *pdev)
if (!sdw->cdns.bus.prop.hw_disabled) {
intel_debugfs_exit(sdw);
sdw_cdns_enable_interrupt(&sdw->cdns, false);
- free_irq(sdw->res->irq, sdw);
+ free_irq(sdw->link_res->irq, sdw);
snd_soc_unregister_component(sdw->cdns.dev);
}
sdw_delete_bus_master(&sdw->cdns.bus);
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 2/5] soundwire: intel: add prepare support in sdw dai driver
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 1/5] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
@ 2020-01-14 23:42 ` Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 3/5] soundwire: intel: add trigger " Pierre-Louis Bossart
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-01-14 23:42 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Pierre-Louis Bossart, Sanyog Kale
From: Rander Wang <rander.wang@linux.intel.com>
The existing code does not expose a prepare operation, which is very
much needed to deal with underflow and resume operations.
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 | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 78b2ebf0119c..bad7c30f1e01 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -699,6 +699,21 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
return ret;
}
+static int intel_prepare(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ struct sdw_cdns_dma_data *dma;
+
+ dma = snd_soc_dai_get_dma_data(dai, substream);
+ if (!dma) {
+ dev_err(dai->dev, "failed to get dma data in %s",
+ __func__);
+ return -EIO;
+ }
+
+ return sdw_prepare_stream(dma->stream);
+}
+
static int
intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
{
@@ -745,6 +760,7 @@ static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai,
static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
.hw_params = intel_hw_params,
+ .prepare = intel_prepare,
.hw_free = intel_hw_free,
.shutdown = intel_shutdown,
.set_sdw_stream = intel_pcm_set_sdw_stream,
@@ -752,6 +768,7 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
.hw_params = intel_hw_params,
+ .prepare = intel_prepare,
.hw_free = intel_hw_free,
.shutdown = intel_shutdown,
.set_sdw_stream = intel_pdm_set_sdw_stream,
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 3/5] soundwire: intel: add trigger support in sdw dai driver
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 1/5] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 2/5] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
@ 2020-01-14 23:42 ` Pierre-Louis Bossart
2020-01-14 23:42 ` [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-01-14 23:42 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Pierre-Louis Bossart, Sanyog Kale
From: Rander Wang <rander.wang@linux.intel.com>
The existing code does not expose a trigger callback, which is very
much required for streaming.
The SoundWire stream is enabled and disabled in trigger function.
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 | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index bad7c30f1e01..999aa2cd9fea 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -714,6 +714,43 @@ static int intel_prepare(struct snd_pcm_substream *substream,
return sdw_prepare_stream(dma->stream);
}
+static int intel_trigger(struct snd_pcm_substream *substream, int cmd,
+ struct snd_soc_dai *dai)
+{
+ struct sdw_cdns_dma_data *dma;
+ int ret;
+
+ dma = snd_soc_dai_get_dma_data(dai, substream);
+ if (!dma) {
+ dev_err(dai->dev, "failed to get dma data in %s", __func__);
+ return -EIO;
+ }
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ case SNDRV_PCM_TRIGGER_RESUME:
+ ret = sdw_enable_stream(dma->stream);
+ break;
+
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+ case SNDRV_PCM_TRIGGER_STOP:
+ ret = sdw_disable_stream(dma->stream);
+ break;
+
+ default:
+ ret = -EINVAL;
+ break;
+ }
+
+ if (ret)
+ dev_err(dai->dev,
+ "%s trigger %d failed: %d",
+ __func__, cmd, ret);
+ return ret;
+}
+
static int
intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
{
@@ -761,6 +798,7 @@ static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai,
static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
.hw_params = intel_hw_params,
.prepare = intel_prepare,
+ .trigger = intel_trigger,
.hw_free = intel_hw_free,
.shutdown = intel_shutdown,
.set_sdw_stream = intel_pcm_set_sdw_stream,
@@ -769,6 +807,7 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
.hw_params = intel_hw_params,
.prepare = intel_prepare,
+ .trigger = intel_trigger,
.hw_free = intel_hw_free,
.shutdown = intel_shutdown,
.set_sdw_stream = intel_pdm_set_sdw_stream,
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
` (2 preceding siblings ...)
2020-01-14 23:42 ` [PATCH v2 3/5] soundwire: intel: add trigger " Pierre-Louis Bossart
@ 2020-01-14 23:42 ` Pierre-Louis Bossart
2020-02-12 10:12 ` Vinod Koul
2020-01-14 23:42 ` [PATCH v2 5/5] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
2020-02-10 14:28 ` [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
5 siblings, 1 reply; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-01-14 23:42 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Pierre-Louis Bossart, Sanyog Kale
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 | 64 +++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 999aa2cd9fea..c498812522ab 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -617,6 +617,68 @@ 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;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ name = kasprintf(GFP_KERNEL, "%s-Playback", dai->name);
+ else
+ name = kasprintf(GFP_KERNEL, "%s-Capture", dai->name);
+
+ if (!name)
+ return -ENOMEM;
+
+ 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 +858,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 +868,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
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback
2020-01-14 23:42 ` [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
@ 2020-02-12 10:12 ` Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2020-02-12 10:12 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: alsa-devel, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Sanyog Kale
On 14-01-20, 17:42, 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 | 64 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 64 insertions(+)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index 999aa2cd9fea..c498812522ab 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -617,6 +617,68 @@ 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;
> +
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + name = kasprintf(GFP_KERNEL, "%s-Playback", dai->name);
> + else
> + name = kasprintf(GFP_KERNEL, "%s-Capture", dai->name);
I don't see name being feed on success. It is nicely freed on error but on
success it should be freed when you close
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
` (3 preceding siblings ...)
2020-01-14 23:42 ` [PATCH v2 4/5] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
@ 2020-01-14 23:42 ` Pierre-Louis Bossart
2020-02-12 10:15 ` Vinod Koul
2020-02-10 14:28 ` [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
5 siblings, 1 reply; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-01-14 23:42 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Pierre-Louis Bossart, Sanyog Kale
Make sure all calls to the SoundWire stream API are done and involve
callback
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 | 40 +++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index c498812522ab..e0c1fff7c4a0 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -550,6 +550,25 @@ static int intel_params_stream(struct sdw_intel *sdw,
return -EIO;
}
+static int intel_free_stream(struct sdw_intel *sdw,
+ struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai,
+ int link_id)
+{
+ struct sdw_intel_link_res *res = sdw->link_res;
+ struct sdw_intel_stream_free_data free_data;
+
+ free_data.substream = substream;
+ free_data.dai = dai;
+ free_data.link_id = link_id;
+
+ if (res->ops && res->ops->free_stream && res->dev)
+ return res->ops->free_stream(res->dev,
+ &free_data);
+
+ return 0;
+}
+
/*
* bank switch routines
*/
@@ -817,6 +836,7 @@ static int
intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
{
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 ret;
@@ -824,12 +844,28 @@ 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;
+ }
+
ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
- if (ret < 0)
+ if (ret < 0) {
dev_err(dai->dev, "remove master from stream %s failed: %d\n",
dma->stream->name, ret);
+ return ret;
+ }
- return ret;
+ ret = intel_free_stream(sdw, substream, dai, sdw->instance);
+ if (ret < 0) {
+ dev_err(dai->dev, "intel_free_stream: failed %d", ret);
+ return ret;
+ }
+
+ sdw_release_stream(dma->stream);
+
+ return 0;
}
static void intel_shutdown(struct snd_pcm_substream *substream,
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
2020-01-14 23:42 ` [PATCH v2 5/5] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
@ 2020-02-12 10:15 ` Vinod Koul
2020-02-12 15:37 ` [alsa-devel] " Pierre-Louis Bossart
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2020-02-12 10:15 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: alsa-devel, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Sanyog Kale
On 14-01-20, 17:42, Pierre-Louis Bossart wrote:
> Make sure all calls to the SoundWire stream API are done and involve
> callback
>
> 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 | 40 +++++++++++++++++++++++++++++++++++++--
> 1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index c498812522ab..e0c1fff7c4a0 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -550,6 +550,25 @@ static int intel_params_stream(struct sdw_intel *sdw,
> return -EIO;
> }
>
> +static int intel_free_stream(struct sdw_intel *sdw,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai,
> + int link_id)
> +{
> + struct sdw_intel_link_res *res = sdw->link_res;
> + struct sdw_intel_stream_free_data free_data;
where is this struct sdw_intel_stream_free_data defined. I dont see it
in this patch or this series..
> +
> + free_data.substream = substream;
> + free_data.dai = dai;
> + free_data.link_id = link_id;
> +
> + if (res->ops && res->ops->free_stream && res->dev)
> + return res->ops->free_stream(res->dev,
> + &free_data);
> +
> + return 0;
> +}
> +
> /*
> * bank switch routines
> */
> @@ -817,6 +836,7 @@ static int
> intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
> {
> 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 ret;
>
> @@ -824,12 +844,28 @@ 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;
> + }
> +
> ret = sdw_stream_remove_master(&cdns->bus, dma->stream);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(dai->dev, "remove master from stream %s failed: %d\n",
> dma->stream->name, ret);
> + return ret;
> + }
>
> - return ret;
> + ret = intel_free_stream(sdw, substream, dai, sdw->instance);
> + if (ret < 0) {
> + dev_err(dai->dev, "intel_free_stream: failed %d", ret);
> + return ret;
> + }
> +
> + sdw_release_stream(dma->stream);
I think, free the 'name' here would be apt
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [alsa-devel] [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
2020-02-12 10:15 ` Vinod Koul
@ 2020-02-12 15:37 ` Pierre-Louis Bossart
2020-02-13 4:23 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-02-12 15:37 UTC (permalink / raw)
To: Vinod Koul
Cc: alsa-devel, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Sanyog Kale
Hi Vinod,
>> +static int intel_free_stream(struct sdw_intel *sdw,
>> + struct snd_pcm_substream *substream,
>> + struct snd_soc_dai *dai,
>> + int link_id)
>> +{
>> + struct sdw_intel_link_res *res = sdw->link_res;
>> + struct sdw_intel_stream_free_data free_data;
>
> where is this struct sdw_intel_stream_free_data defined. I dont see it
> in this patch or this series..
the definition is already upstream :-)
It was added in December with
4b206d34b92224 ('soundwire: intel: update stream callbacks for
hwparams/free stream operations')
>> - return ret;
>> + ret = intel_free_stream(sdw, substream, dai, sdw->instance);
>> + if (ret < 0) {
>> + dev_err(dai->dev, "intel_free_stream: failed %d", ret);
>> + return ret;
>> + }
>> +
>> + sdw_release_stream(dma->stream);
>
> I think, free the 'name' here would be apt
Right, this is something we discussed with Rander shortly before Chinese
New Year and we wanted to handle this with a follow-up patch, would that
work for you? if not I can send a v3, your choice.
Thanks
-Pierre
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [alsa-devel] [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
2020-02-12 15:37 ` [alsa-devel] " Pierre-Louis Bossart
@ 2020-02-13 4:23 ` Vinod Koul
2020-02-13 15:05 ` Pierre-Louis Bossart
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2020-02-13 4:23 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: alsa-devel, linux-kernel, tiwai, broonie, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan, Sanyog Kale
On 12-02-20, 09:37, Pierre-Louis Bossart wrote:
> Hi Vinod,
>
> > > +static int intel_free_stream(struct sdw_intel *sdw,
> > > + struct snd_pcm_substream *substream,
> > > + struct snd_soc_dai *dai,
> > > + int link_id)
> > > +{
> > > + struct sdw_intel_link_res *res = sdw->link_res;
> > > + struct sdw_intel_stream_free_data free_data;
> >
> > where is this struct sdw_intel_stream_free_data defined. I dont see it
> > in this patch or this series..
>
> the definition is already upstream :-)
Oops did i look at wrong branch, sorry!
> > > + ret = intel_free_stream(sdw, substream, dai, sdw->instance);
> > > + if (ret < 0) {
> > > + dev_err(dai->dev, "intel_free_stream: failed %d", ret);
> > > + return ret;
> > > + }
> > > +
> > > + sdw_release_stream(dma->stream);
> >
> > I think, free the 'name' here would be apt
>
> Right, this is something we discussed with Rander shortly before Chinese New
> Year and we wanted to handle this with a follow-up patch, would that work
> for you? if not I can send a v3, your choice.
It would be better if we fix this up in this series :)
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [alsa-devel] [PATCH v2 5/5] soundwire: intel: free all resources on hw_free()
2020-02-13 4:23 ` Vinod Koul
@ 2020-02-13 15:05 ` Pierre-Louis Bossart
0 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-02-13 15:05 UTC (permalink / raw)
To: Vinod Koul
Cc: alsa-devel, tiwai, gregkh, linux-kernel, Ranjani Sridharan,
broonie, srinivas.kandagatla, jank, slawomir.blauciak,
Sanyog Kale, Bard liao, Rander Wang
>>>> + ret = intel_free_stream(sdw, substream, dai, sdw->instance);
>>>> + if (ret < 0) {
>>>> + dev_err(dai->dev, "intel_free_stream: failed %d", ret);
>>>> + return ret;
>>>> + }
>>>> +
>>>> + sdw_release_stream(dma->stream);
>>>
>>> I think, free the 'name' here would be apt
>>
>> Right, this is something we discussed with Rander shortly before Chinese New
>> Year and we wanted to handle this with a follow-up patch, would that work
>> for you? if not I can send a v3, your choice.
>
> It would be better if we fix this up in this series :)
ok, I will fix this later today.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 0/5] soundwire: intel: add DAI callbacks
2020-01-14 23:42 [PATCH v2 0/5] soundwire: intel: add DAI callbacks Pierre-Louis Bossart
` (4 preceding siblings ...)
2020-01-14 23:42 ` [PATCH v2 5/5] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
@ 2020-02-10 14:28 ` Pierre-Louis Bossart
5 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2020-02-10 14:28 UTC (permalink / raw)
To: alsa-devel
Cc: linux-kernel, tiwai, broonie, vkoul, gregkh, jank,
srinivas.kandagatla, slawomir.blauciak, Bard liao, Rander Wang,
Ranjani Sridharan
On 1/14/20 5:42 PM, Pierre-Louis Bossart wrote:
> The existing mainline code is missing most of the DAI callbacks needed
> for a functional implementation, and the existing ones need to be
> modified to provide the relevant information to SOF drivers.
>
> As suggested by Vinod, these patches are shared first - with the risk
> that they are separated from the actual DAI enablement, so reviewers
> might wonder why they are needed in the first place.
>
> For reference, the complete set of 90+ patches required for SoundWire
> on Intel platforms is available here:
>
> https://github.com/thesofproject/linux/pull/1692
Vinod, these patches have been in the queue for quite some time, and
v5.6-rc1 is out. Can we move on with the reviews?
Thanks!
>
> changes since v1:
> Fix string allocation (only feedback from Vinod)
>
> Pierre-Louis Bossart (2):
> soundwire: intel: rename res field as link_res
> soundwire: intel: free all resources on hw_free()
>
> Rander Wang (3):
> soundwire: intel: add prepare support in sdw dai driver
> soundwire: intel: add trigger support in sdw dai driver
> soundwire: intel: add sdw_stream_setup helper for .startup callback
>
> drivers/soundwire/intel.c | 197 ++++++++++++++++++++++++++++++++++----
> 1 file changed, 177 insertions(+), 20 deletions(-)
>
^ permalink raw reply [flat|nested] 12+ messages in thread