August 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/3] topology: Add external API for building topology data.
by Liam Girdwood 10 Aug '15

10 Aug '15

Currently we can build topology binary data files from topology text files. However it is sometimes necessary for DSP FW vendors to build topology binary data within a toolset and create topology binary data directly from within vendor tools. This series adds an API to the alsa-lib topology core so that vendor tools can create topology data directly. Mengdong Lin (3): topology: Add C templates structure for building topology from C programs topology: A API calls to directly build topology data from templates topology: add support for adding bytes controls to widgets include/sound/asoc.h | 2 + include/topology.h | 202 ++++++++++++++++++++++++++++ src/topology/builder.c | 38 +++--- src/topology/ctl.c | 329 +++++++++++++++++++++++++++++++++++++++++++--- src/topology/dapm.c | 226 ++++++++++++++++++++++++++----- src/topology/data.c | 10 +- src/topology/elem.c | 43 ++++-- src/topology/parser.c | 63 ++++++++- src/topology/pcm.c | 34 ++--- src/topology/text.c | 2 +- src/topology/tplg_local.h | 33 ++--- 11 files changed, 849 insertions(+), 133 deletions(-) -- 2.1.4

2 5

[alsa-devel] ALSA: es1968: Use monotonic clock
by Abhilash Jindal 10 Aug '15

10 Aug '15

Wall time obtained from do_gettimeofday is susceptible to sudden jumps due to user setting the time or due to NTP. Monotonic time is constantly increasing time better suited for comparing two timestamps. --- sound/pci/es1968.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index b0e3d92..6830c31 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -1710,7 +1710,7 @@ static void es1968_measure_clock(struct es1968 *chip) int i, apu; unsigned int pa, offset, t; struct esm_memory *memory; - struct timeval start_time, stop_time; + struct timespec start_time, stop_time; if (chip->clock == 0) chip->clock = 48000; /* default clock value */ @@ -1759,12 +1759,12 @@ static void es1968_measure_clock(struct es1968 *chip) snd_es1968_bob_inc(chip, ESM_BOB_FREQ); __apu_set_register(chip, apu, 5, pa & 0xffff); snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR); - do_gettimeofday(&start_time); + ktime_get_ts(&start_time); spin_unlock_irq(&chip->reg_lock); msleep(50); spin_lock_irq(&chip->reg_lock); offset = __apu_get_register(chip, apu, 5); - do_gettimeofday(&stop_time); + ktime_get_ts(&stop_time); snd_es1968_trigger_apu(chip, apu, 0); /* stop */ snd_es1968_bob_dec(chip); chip->in_measurement = 0; @@ -1776,11 +1776,11 @@ static void es1968_measure_clock(struct es1968 *chip) offset += chip->measure_count * (CLOCK_MEASURE_BUFSIZE/2); t = stop_time.tv_sec - start_time.tv_sec; - t *= 1000000; - if (stop_time.tv_usec < start_time.tv_usec) - t -= start_time.tv_usec - stop_time.tv_usec; + t *= USEC_PER_SEC; + if (stop_time.tv_nsec < start_time.tv_nsec) + t -= (start_time.tv_nsec - stop_time.tv_nsec)/NSEC_PER_USEC; else - t += stop_time.tv_usec - start_time.tv_usec; + t += (stop_time.tv_nsec - start_time.tv_nsec)/NSEC_PER_USEC; if (t == 0) { snd_printk(KERN_ERR "?? calculation error..\n"); } else { -- 1.7.9.5

2 1

[alsa-devel] RME MADIFX mainline inclusion
by Adrian Knoth 10 Aug '15

10 Aug '15

Hi Takashi! Back in the days (late 2012 I guess), I wrote the MADIFX driver based on the existing RME hdspm.c. I never had physical access to this 1399 Euro audio interface, only the OSX driver and a shell login to one of IOSONO's machines which temporarily featured such a card. I know there are other users like University of Washington (DXARTS) and probably some more (the usual WFS suspects). Long story short: I don't have such a card and since I no longer work in Linux audio, I guess I won't have access in the foreseeable future. That said, I think the driver should be part of the mainline kernel, so it gets all the love the other drivers get (static code analysis, API changes etc.) I think I've ported everything you guys have done to hdspm: I've read the commitlog for hdspm and applied those changes to the madifx driver. Code is here: https://github.com/adiknoth/madifx/commits/tokernel Status: * PCM playback/capture working (SS and DS tested, QS untested) * MIDI working * All card settings working (e.g. TX64, SMUX, AESpro, WC-Term, WC-singlespeed...) * Slave Mode/External clock selection working * Mirror-MADI1-to-Out2+3 maybe working (untested) * Redundancy mode maybe working (untested) * ioctls implemented (see ioctl.c) * Static mixer working (fixed 1:1 mapping) * DSP NOT working. RME doesn't intend to release any information regarding the DSP. * Adjustable mixer NOT working (needs new userspace tools) * Levelmetering NOT working (maybe wrong, needs new userspace tools) I have no idea who could write the new mixer code. Apparently, demand is low, maybe zero. checkpatch reports four warnings of which one is a false-positive, the other one doesn't make sense and only two are real but somewhat ugly to fix (line over 80 with really long array indices). In its current state, can I send you three patches (Kconfig, madifx.h, madifx.c) that add said driver to sound/pci/rme9652? Cheers

6 16

[alsa-devel] DP MST audio support
by Dave Airlie 10 Aug '15

10 Aug '15

Hi, So I have a branch that makes no sound, http://cgit.freedesktop.org/~airlied/linux/log/?h=dp-mst-audio and I'm not sure where I need to turn to next, The Intel docs I've read are kinda vague, assuming you know lots of things I clearly don't. so in theory my branch, sets up the SDP stream to the monitor in the payload creation, enables the codec in the intel GPU driver, and passes the ELD to the audio driver. The audio driver uses the device list to get the presence/valid bits per device, and manages to retrieve the ELD. I even create ELD files in /proc/asound/HDMI/ that have sensible values in them So it looks like I'm just missing some routing somewhere, most likely in the audio driver, then again I could be missing a lot more than that. Just looking for any ideas or knowledge people may have locked in their brains or inside their firewalls. Dave.

4 6

[alsa-devel] [RFC PATCH 10/10] ASOC: topology: Add PCM DAIs dynamically when loading them
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Add PCM DAIs to ASoC core when loading them from topology. Embed dobj in the DAI to free it when unloading. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2df96b1..e8f0404 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -207,6 +207,7 @@ struct snd_soc_dai_driver { const char *name; unsigned int id; unsigned int base; + struct snd_soc_dobj dobj; /* DAI driver callbacks */ int (*probe)(struct snd_soc_dai *dai); diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 5405f64..a49c134 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -71,7 +71,6 @@ struct snd_soc_dobj { union { struct snd_soc_dobj_control control; struct snd_soc_dobj_widget widget; - struct snd_soc_dobj_pcm_dai pcm_dai; }; void *private; /* core does not touch this */ }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0f8fa0d..6c0dd3f 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -499,6 +499,9 @@ static void remove_widget(struct snd_soc_component *comp, static void remove_pcm_dai(struct snd_soc_component *comp, struct snd_soc_dobj *dobj, int pass) { + struct snd_soc_dai_driver *dai = + container_of(dobj, struct snd_soc_dai_driver, dobj); + if (pass != SOC_TPLG_PASS_PCM_DAI) return; @@ -506,7 +509,7 @@ static void remove_pcm_dai(struct snd_soc_component *comp, dobj->ops->pcm_dai_unload(comp, dobj); list_del(&dobj->list); - kfree(dobj); + kfree(dai); } /* bind a kcontrol to it's IO handlers */ @@ -1558,12 +1561,75 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg) return 0; } +static unsigned int get_rates(unsigned int rate_min, unsigned int rate_max) +{ + static int pcm_rates[] = { + 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, + 64000, 88200, 96000, 176400, 192000, + }; + unsigned int rates = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(pcm_rates); i++) { + if (pcm_rates[i] >= rate_min && pcm_rates[i] <= rate_max) + rates |= 1 << i; + } + + return rates; +} + +static int soc_tplg_pcm_dai_create(struct soc_tplg *tplg, + struct snd_soc_tplg_pcm_dai *dai) +{ + struct snd_soc_dai_driver *dai_drv; + struct snd_soc_pcm_stream *stream; + struct snd_soc_tplg_stream_caps *caps; + + dai_drv = kzalloc(sizeof(struct snd_soc_dai_driver), GFP_KERNEL); + if (dai_drv == NULL) + return -ENOMEM; + + dai_drv->name = dai->name; + dai_drv->id = dai->id; + dai_drv->compress_dai = dai->compress; + + if (dai->playback) { + stream = &dai_drv->playback; + caps = &dai->capconf[SND_SOC_TPLG_STREAM_PLAYBACK].caps; + + stream->stream_name = kstrdup(caps->name, GFP_KERNEL); + stream->channels_min = caps->channels_min; + stream->channels_max = caps->channels_max; + stream->rates = get_rates(caps->rate_min, caps->rate_max); + stream->formats = caps->formats; + } + + if (dai->capture) { + stream = &dai_drv->capture; + caps = &dai->capconf[SND_SOC_TPLG_STREAM_CAPTURE].caps; + + stream->stream_name = kstrdup(caps->name, GFP_KERNEL); + stream->channels_min = caps->channels_min; + stream->channels_max = caps->channels_max; + stream->rates = get_rates(caps->rate_min, caps->rate_max); + stream->formats = caps->formats; + } + + dai_drv->dobj.index = tplg->index; + dai_drv->dobj.ops = tplg->ops; + dai_drv->dobj.type = SND_SOC_DOBJ_PCM; + list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list); + + return snd_soc_add_dai(tplg->comp, dai_drv); +} + static int soc_tplg_pcm_dai_elems_load(struct soc_tplg *tplg, struct snd_soc_tplg_hdr *hdr) { struct snd_soc_tplg_pcm_dai *pcm_dai; struct snd_soc_dobj *dobj; int count = hdr->count; + int i; int ret; if (tplg->pass != SOC_TPLG_PASS_PCM_DAI) @@ -1579,26 +1645,21 @@ static int soc_tplg_pcm_dai_elems_load(struct soc_tplg *tplg, return -EINVAL; } - dev_dbg(tplg->dev, "ASoC: adding %d PCM DAIs\n", count); - tplg->pos += sizeof(struct snd_soc_tplg_pcm_dai) * count; - - dobj = kzalloc(sizeof(struct snd_soc_dobj), GFP_KERNEL); - if (dobj == NULL) - return -ENOMEM; - - /* Call the platform driver call back to register the dais */ + /* pass control to driver for optional further init */ ret = soc_tplg_pcm_dai_load(tplg, pcm_dai, count); if (ret < 0) { dev_err(tplg->comp->dev, "ASoC: PCM DAI loading failed\n"); goto err; } - dobj->type = get_dobj_type(hdr, NULL); - dobj->pcm_dai.count = count; - dobj->pcm_dai.pd = pcm_dai; - dobj->ops = tplg->ops; - dobj->index = tplg->index; - list_add(&dobj->list, &tplg->comp->dobj_list); + /* register the dais */ + for (i = 0; i < count; i++) { + soc_tplg_pcm_dai_create(tplg, pcm_dai); + pcm_dai++; + } + + dev_dbg(tplg->dev, "ASoC: adding %d PCM DAIs\n", count); + tplg->pos += sizeof(struct snd_soc_tplg_pcm_dai) * count; return 0; err: -- 1.9.1

1 0

[alsa-devel] [RFC PATCH 09/10] ASoC: Topology: change stream formats to bitwise flag
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> The toplogy user space tool will generate this bitwise flag by using SNDRV_PCM_FORMAT_* exposed by asound.h, and the topology core will copy this flag when generating DAI streams. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 69383b0..eb2ad59 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -191,7 +191,7 @@ struct snd_soc_tplg_ctl_hdr { struct snd_soc_tplg_stream_caps { __le32 size; /* in bytes of this structure */ char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; - __le64 formats[SND_SOC_TPLG_MAX_FORMATS]; /* supported formats SNDRV_PCM_FMTBIT_* */ + __le64 formats; /* supported formats SNDRV_PCM_FORMAT_* */ __le32 rates; /* supported rates SNDRV_PCM_RATE_* */ __le32 rate_min; /* min rate */ __le32 rate_max; /* max rate */ -- 1.9.1

1 0

[alsa-devel] [RFC PATCH 07/10] ASoC: support adding a DAI dynamically
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> API snd_soc_add_dai() is defined to register a DAI dynamically, create its DAI widget, and notify the machine driver. This API can be used by the topology core to add DAIs dynamically. And a callback add_dai() is defined for the soc card. The machine driver can implement this callback. Adding a new DAI dynmaically will trigger this callback, and the machine driver can create relavant DAI link in the callback context. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/soc.h b/include/sound/soc.h index 7e04ec0..2a474c8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1081,6 +1081,7 @@ struct snd_soc_card { int (*set_bias_level_post)(struct snd_soc_card *, struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level); + int (*add_dai)(struct snd_soc_card *, struct snd_soc_dai_driver*); long pmdown_time; @@ -1634,6 +1635,9 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev, void snd_soc_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); +int snd_soc_add_dai(struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv); + #include <sound/soc-dai.h> #ifdef CONFIG_DEBUG_FS diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2818709..b330676 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2792,6 +2792,98 @@ err: return ret; } +static struct snd_soc_dai *soc_register_dai(struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv, + bool legacy_dai_naming) +{ + struct device *dev = component->dev; + struct snd_soc_dai *dai; + int ret; + + dev_dbg(dev, "ASoC: dynamically register DAI %s\n", dev_name(dev)); + + dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL); + if (dai == NULL) { + ret = -ENOMEM; + goto err; + } + + /* + * Back in the old days when we still had component-less DAIs, + * instead of having a static name, component-less DAIs would + * inherit the name of the parent device so it is possible to + * register multiple instances of the DAI. We still need to keep + * the same naming style even though those DAIs are not + * component-less anymore. + */ + if (legacy_dai_naming) { + dai->name = fmt_single_name(dev, &dai->id); + } else { + dai->name = fmt_multiple_name(dev, dai_drv); + if (dai_drv->id) + dai->id = dai_drv->id; + else + dai->id = component->num_dai; + } + if (dai->name == NULL) { + kfree(dai); + ret = -ENOMEM; + goto err; + } + + dai->component = component; + dai->dev = dev; + dai->driver = dai_drv; + if (!dai->driver->ops) + dai->driver->ops = &null_dai_ops; + + list_add(&dai->list, &component->dai_list); + component->num_dai++; + + dev_dbg(dev, "ASoC: Registered DAI '%s'\n", dai->name); + return dai; + +err: + kfree(dai); + return NULL; +} + +/** + * snd_soc_add_dai - Add a DAI dynamically with the ASoC core + * + * @component: The component the DAIs are registered for + * @dai_drv: DAI driver to use for the DAI + */ +int snd_soc_add_dai(struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv) +{ + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + struct snd_soc_card *card = component->card; + struct snd_soc_dai *dai; + int ret; + + lockdep_assert_held(&client_mutex); + dai = soc_register_dai(component, dai_drv, false); + if (!dai) + return -ENOMEM; + + ret = snd_soc_dapm_new_dai_widgets(dapm, dai); + if (ret != 0) { + dev_err(component->dev, + "Failed to create DAI widgets %d\n", ret); + } + + /* Notify the machine driver a new DAI is added, so the machine driver + * can add new DAI links in the callback context. + */ + if (card && card->add_dai) + card->add_dai(card, dai_drv); + + return ret; +} +EXPORT_SYMBOL_GPL(snd_soc_add_dai); + static void snd_soc_component_seq_notifier(struct snd_soc_dapm_context *dapm, enum snd_soc_dapm_type type, int subseq) { -- 1.9.1

1 0

[alsa-devel] [RFC PATCH 06/10] ASoC: bind new DAI links after probing components.
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Probing components can bring new DAI or DAI links based on the topology info. This patch finds the unbound DAI links and bind them. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f552fa0..2818709 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1169,6 +1169,19 @@ static void soc_remove_dai_links(struct snd_soc_card *card) } } +static bool soc_is_dai_link_bound(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link) +{ + struct snd_soc_pcm_runtime *rtd; + + list_for_each_entry(rtd, &card->rtd_list, list) { + if (rtd->dai_link == dai_link) + return true; + } + + return false; +} + static int snd_soc_init_multicodec(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { @@ -1763,6 +1776,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) { struct snd_soc_codec *codec; struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai_link *dai_link; int ret, i, order; mutex_lock(&client_mutex); @@ -1853,6 +1867,21 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) /* no longer need dummy runtimes */ soc_remove_dummy_pcm_runtimes(card); + /* Find new DAI links added during probing components and bind them. + * Components with topology may bring new DAIs and DAI links. + */ + list_for_each_entry(dai_link, &card->dai_link_list, list) { + if (dai_link->dummy || soc_is_dai_link_bound(card, dai_link)) + continue; + + ret = soc_init_dai_link(card, dai_link); + if (ret) + goto probe_dai_err; + ret = soc_bind_dai_link(card, dai_link); + if (ret) + goto probe_dai_err; + } + /* probe all DAI links on this card */ for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { -- 1.9.1

1 0

[alsa-devel] [RFC PATCH 05/10] ASoC: Add support for dummy DAI links and PCM runtimes
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Add dummy flag to a DAI link and PCM runtime. A dummy link will create a dummy PCM runtime. A machine driver can define dummy dai links to specify the expected platform and codec. And its dummy runtime is used to probe the platform and codec components, which can bring real DAI/DAI links based on topology. After components probing, all dummy PCM runtimes will be removed. Only non-dummy PCM runtimes will be assigned a valid number and create PCM streams. The ASoC core will find the platform for a dummy DAI link, assuming the cpu DAI can be dummy but the platform can bring the topology info. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/soc.h b/include/sound/soc.h index 79891e2..7e04ec0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -970,6 +970,11 @@ struct snd_soc_dai_link { enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ + /* This DAI link is dummy. Machine drivers can define static dummy + * links to specify platform/codec with topology. + */ + bool dummy; + /* codec/machine specific init - e.g. add machine controls */ int (*init)(struct snd_soc_pcm_runtime *rtd); @@ -1087,6 +1092,7 @@ struct snd_soc_card { struct list_head rtd_list; int num_rtd; + int num_rtd_dev; /* monotonic increase and exclude dummy ones */ /* optional codec specific configuration */ struct snd_soc_codec_conf *codec_conf; @@ -1181,6 +1187,7 @@ struct snd_soc_pcm_runtime { struct dentry *debugfs_dpcm_state; #endif + bool dummy; unsigned int num; /* 0-based and monotonic increasing */ struct list_head list; /* rtd list of the soc card */ }; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 58eac57..f552fa0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -561,6 +561,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( rtd->card = card; rtd->dai_link = dai_link; + rtd->dummy = dai_link->dummy; rtd->codec_dais = devm_kzalloc(card->dev, sizeof(struct snd_soc_dai *) * dai_link->num_codecs, @@ -583,10 +584,28 @@ static void soc_add_pcm_runtime(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd) { list_add_tail(&rtd->list, &card->rtd_list); - rtd->num = card->num_rtd; + + if (!rtd->dummy) { + rtd->num = card->num_rtd_dev; + card->num_rtd_dev++; + } + card->num_rtd++; } +static void soc_remove_dummy_pcm_runtimes(struct snd_soc_card *card) +{ + struct snd_soc_pcm_runtime *rtd, *_rtd; + + list_for_each_entry_safe(rtd, _rtd, &card->rtd_list, list) { + if (rtd->dummy) { + list_del(&rtd->list); + soc_free_pcm_runtime(card, rtd); + card->num_rtd--; + } + } +} + static void soc_remove_pcm_runtimes(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd, *_rtd; @@ -1007,6 +1026,15 @@ static int soc_bind_dai_link(struct snd_soc_card *card, } } + /* Dummy link can use dummy cpu DAI but set platform to get topology */ + if (dai_link->dummy && dai_link->platform_name) { + if (!soc_find_component(NULL, dai_link->platform_name)) { + dev_err(card->dev, "ASoC: Platform %s not registered\n", + dai_link->platform_name); + goto _err_defer; + } + } + /* Single codec links expect codec and codec_dai in runtime data */ rtd->codec_dai = codec_dais[0]; rtd->codec = rtd->codec_dai->codec; @@ -1250,6 +1278,10 @@ static int soc_init_dai_link(struct snd_soc_card *card, void snd_soc_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { + /* Dummy links should be static, so overlook them */ + if (dai_link->dummy) + return; + lockdep_assert_held(&client_mutex); list_add_tail(&dai_link->list, &card->dai_link_list); card->num_dai_links++; @@ -1818,6 +1850,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } } + /* no longer need dummy runtimes */ + soc_remove_dummy_pcm_runtimes(card); + /* probe all DAI links on this card */ for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { @@ -2516,6 +2551,7 @@ int snd_soc_register_card(struct snd_soc_card *card) INIT_LIST_HEAD(&card->rtd_list); card->num_rtd = 0; + card->num_rtd_dev = 0; card->rtd_aux = devm_kzalloc(card->dev, sizeof(struct snd_soc_pcm_runtime) * -- 1.9.1

1 0

[alsa-devel] [RFC PATCH 04/10] ASoC: implement DAI links in a list.
by mengdong.lin＠intel.com 10 Aug '15

10 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Implement a dai link list for the soc card. And API snd_soc_add_dai_link() is defined for machine drivers to add DAI links dynamically based on topology. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/soc.h b/include/sound/soc.h index e2b7b0f..79891e2 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1011,6 +1011,8 @@ struct snd_soc_dai_link { /* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; + + struct list_head list; /* dai link list of the soc card */ }; struct snd_soc_codec_conf { @@ -1078,8 +1080,11 @@ struct snd_soc_card { long pmdown_time; /* CPU <--> Codec DAI links */ - struct snd_soc_dai_link *dai_link; - int num_links; + struct snd_soc_dai_link *dai_link; /* predefined links only */ + int num_links; /* predefined links only */ + struct list_head dai_link_list; /* all links except the dummy ones */ + int num_dai_links; + struct list_head rtd_list; int num_rtd; @@ -1619,6 +1624,9 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev, struct device_node *of_node, struct snd_soc_dai_link *dai_link); +void snd_soc_add_dai_link(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link); + #include <sound/soc-dai.h> #ifdef CONFIG_DEBUG_FS diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ddfdd1d..58eac57 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1235,6 +1235,27 @@ static int soc_init_dai_link(struct snd_soc_card *card, return 0; } +/** + * snd_soc_add_dai_link - Add a DAI link dynamically + * @card: The ASoC card to which the DAI link is added + * @dai_link: The new DAI link to add + * + * This function adds a DAI link to the ASoC card, and creates a ASoC + * runtime for the link. + * + * Note: For adding DAI links dynamically by machine drivers based on + * the topology info when probing the platform component. And machine + * drivers can still define static DAI links in dai_link array. + */ +void snd_soc_add_dai_link(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link) +{ + lockdep_assert_held(&client_mutex); + list_add_tail(&dai_link->list, &card->dai_link_list); + card->num_dai_links++; +} +EXPORT_SYMBOL_GPL(snd_soc_add_dai_link); + static void soc_set_name_prefix(struct snd_soc_card *card, struct snd_soc_component *component) { @@ -1729,6 +1750,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) goto base_error; } + /* all predefined resources are ready, store non-dummy links */ + for (i = 0; i < card->num_links; i++) + snd_soc_add_dai_link(card, card->dai_link+i); + /* initialize the register cache for each available codec */ list_for_each_entry(codec, &codec_list, list) { if (codec->cache_init) @@ -2486,6 +2511,9 @@ int snd_soc_register_card(struct snd_soc_card *card) snd_soc_initialize_card_lists(card); + INIT_LIST_HEAD(&card->dai_link_list); + card->num_dai_links = 0; + INIT_LIST_HEAD(&card->rtd_list); card->num_rtd = 0; -- 1.9.1

1 0