An error occurred fetching the project authors.
- 16 Apr, 2018 2 commits
-
-
Kirill Marinushkin authored
Clock gating parameter is a part of `dai_fmt`. It is supported by `alsa-lib` when creating a topology binary file, but ignored by kernel when loading this topology file. After applying this commit, the clock gating parameter is not ignored any more. This solution is backwards compatible. The existing behaviour is not broken, because by default the parameter value is 0 and is ignored. snd_soc_tplg_hw_config.clock_gated = 0 => no effect snd_soc_tplg_hw_config.clock_gated = 1 => SND_SOC_DAIFMT_GATED snd_soc_tplg_hw_config.clock_gated = 2 => SND_SOC_DAIFMT_CONT For example, the following config, based on alsa-lib/src/conf/topology/broadwell/broadwell.conf, is now supported: ~~~~ SectionHWConfig."CodecHWConfig" { id "1" format "I2S" # physical audio format. pm_gate_clocks "true" # clock can be gated } SectionLink."Codec" { # used for binding to the physical link id "0" hw_configs [ "CodecHWConfig" ] default_hw_conf_id "1" } ~~~~ Signed-off-by:
Kirill Marinushkin <k.marinushkin@gmail.com> Reviewed-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Mark Brown <broonie@kernel.org> Cc: Pan Xiuli <xiuli.pan@linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> Cc: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Kirill Marinushkin authored
The values of bclk and fsync are inverted WRT the codec. But the existing solution already works for Broadwell, see the alsa-lib config: `alsa-lib/src/conf/topology/broadwell/broadwell.conf` This commit provides the backwards-compatible solution to fix this misuse. Signed-off-by:
Kirill Marinushkin <k.marinushkin@gmail.com> Reviewed-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Tested-by:
Pan Xiuli <xiuli.pan@linux.intel.com> Tested-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Mark Brown <broonie@kernel.org> Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> Cc: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 12 Apr, 2018 1 commit
-
-
Dan Carpenter authored
These tiny memory leaks don't have a huge real life impact but they cause static checker warnings so let's fix them. Signed-off-by:
Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 27 Mar, 2018 1 commit
-
-
Liam Girdwood authored
Fix the topology kcontrol string handling so that string pointer references are strdup()ed instead of being copied. This fixes issues with kcontrol templates on the stack or ones that are freed. Remember and free the strings too when topology is unloaded. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
-
- 19 Mar, 2018 1 commit
-
-
Liam Girdwood authored
Validate the topology input before we dereference the pointer. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 12 Mar, 2018 1 commit
-
-
Ranjani Sridharan authored
This patch adds the change required to create the TLV data for dapm widget kcontrols from topology. This also fixes the following TLV read error shown in amixer while showing the card control contents. "amixer: Control hw:1 element TLV read error: No such device or address" Signed-off-by:
Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 14 Sep, 2017 2 commits
-
-
Christophe JAILLET authored
If this sanity check fails, we must free the memory that has already been allocated. So we must go to 'err' as in the other error handling parth of this function. Fixes: 1a7dd6e2 ("ASoC: topology: Allow a widget to have multiple enum controls") Signed-off-by:
Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Christophe JAILLET authored
if 'se = kzalloc()' fails in the 'for' loop, we will branch to 'err'. But in this case, 'kc[i].private_value' will still be NULL. A NULL pointer dereference will then occur is the error handling path. In such a case, it is safe to just 'continue' in order to skip this entry and free the other ones. Fixes: 1a7dd6e2 ("ASoC: topology: Allow a widget to have multiple enum controls") Signed-off-by:
Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 30 Jun, 2017 3 commits
-
-
Liam Girdwood authored
Add some DAPM widget types to better support the construction of DAPM graphs within DSPs. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Liam Girdwood authored
Makes the debug output much more useful. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Liam Girdwood authored
SND_SOC_TPLG_INDEX_ALL is used by drivers to tell the core to load all topology component indexes, not just the index in the header. Fix this so that SND_SOC_TPLG_INDEX_ALL will load all components no matter their index. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 09 Jun, 2017 1 commit
-
-
Liam Girdwood authored
Current topology only allows for widget configuration before the widget is registered. This patch also allows further configuration and usage after registration is complete. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 08 Jun, 2017 1 commit
-
-
Mark Brown authored
Due to build errors revert commit c8597af8 (ASoC: topology: Allow bespoke configuration post widget creation) until they can be fixed. Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 07 Jun, 2017 3 commits
-
-
Liam Girdwood authored
Template name pointers are copied when creating new widgets and are freed in widget destroy. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Liam Girdwood authored
Rewrite the message to be more meaningful. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Liam Girdwood authored
Current topology only allows for widget configuration before the widget is registered. This patch also allows further configuration and usage after registration is complete. Signed-off-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 18 Apr, 2017 1 commit
-
-
Colin Ian King authored
Currently variable i is being for 2 nested for loops. Fix this by using integer loop counter j for the inside for loop. Signed-off-by:
Colin Ian King <colin.king@canonical.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 11 Apr, 2017 1 commit
-
-
Mousumi Jana authored
Add missing enum texts store in soc_enum. Signed-off-by:
Mousumi Jana <mousumix.jana@intel.com> Signed-off-by:
Pardha Saradhi K <pardha.saradhi.kesapragada@intel.com> Signed-off-by:
Kranthikumar, GudishaX <gudishax.kranthikumar@intel.com> Signed-off-by:
Subhransu S. Prusty <subhransu.s.prusty@intel.com> Acked-by:
Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 28 Feb, 2017 1 commit
-
-
Masahiro Yamada authored
Fix typos and add the following to the scripts/spelling.txt: intialization||initialization The "inintialization" in drivers/acpi/spcr.c is a different pattern but I fixed it as well in this commit. Link: http://lkml.kernel.org/r/1481573103-11329-16-git-send-email-yamada.masahiro@socionext.comSigned-off-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
- 17 Jan, 2017 1 commit
-
-
Linus Walleij authored
This starts to handle probe deferrals on regulators and clocks on the ASoC DAPM. I came to this patch after audio stopped working on Ux500 ages ago and I finally looked into it to see what is wrong. I had messages like this in the console since a while back: ab8500-codec.0: ASoC: Failed to request audioclk: -517 ab8500-codec.0: ASoC: Failed to create DAPM control audioclk ab8500-codec.0: Failed to create new controls -12 snd-soc-mop500.0: ASoC: failed to instantiate card -12 snd-soc-mop500.0: Error: snd_soc_register_card failed (-12)! snd-soc-mop500: probe of snd-soc-mop500.0 failed with error -12 Apparently because the widget table for the codec looks like this (sound/soc/codecs/ab8500-codec.c): static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { /* Clocks */ SND_SOC_DAPM_CLOCK_SUPPLY("audioclk"), /* Regulators */ SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0, 0), SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0, 0), SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0, 0), SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0, 0), So when we call snd_soc_register_codec() and any of these widgets get a deferred probe we do not get an -EPROBE_DEFER (-517) back as we should and instead we just fail. Apparently the code assumes that clocks and regulators must be available at this point and not defer. After this patch it rather looks like this: ab8500-codec.0: Failed to create new controls -517 snd-soc-mop500.0: ASoC: failed to instantiate card -517 snd-soc-mop500.0: Error: snd_soc_register_card failed (-517)! (...) abx500-clk.0: registered clocks for ab850x snd-soc-mop500.0: ab8500-codec-dai.0 <-> ux500-msp-i2s.1 mapping ok snd-soc-mop500.0: ab8500-codec-dai.1 <-> ux500-msp-i2s.3 mapping ok I'm pretty happy about the patch as it it, but I'm a bit uncertain on how to proceed: there are a lot of users of the external functions snd_soc_dapm_new_control() (111 sites) and that will now return an occassional error pointer, which is not handled in the calling sites. I want an indication from the maintainers whether I should just go in and augment all these call sites, or if deferred probe is frowned upon when it leads to this much overhead. Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 12 Jan, 2017 1 commit
-
-
Charles Keepax authored
Signed-off-by:
Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 15 Dec, 2016 2 commits
-
-
Colin Ian King authored
kcontrol->private_value is being kfree'd after kcontrol has been freed (in previous call to snd_ctl_remove). Instead, fix this by kfreeing the private_value before kcontrol. CoverityScan CID#1388311 "Read from pointer after free" Fixes: eea3dd4f ("ASoC: topology: Only free TLV for volume mixers of a widget") Signed-off-by:
Colin Ian King <colin.king@canonical.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Vinod Koul authored
In soc_tplg_pcm_elems_load, a variable 'err' is initialized but not used. It is assigned return values for pcm_new_ver() but never checked, so remove it. sound/soc/soc-topology.c: In function ‘soc_tplg_pcm_elems_load’: sound/soc/soc-topology.c:1865:9: warning: variable ‘err’ set but not used [-Wunused-but-set-variable] int i, err; Signed-off-by:
Vinod Koul <vinod.koul@intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 12 Dec, 2016 1 commit
-
-
Arnd Bergmann authored
When num_kcontrols is zero, widget->dobj.widget.kcontrol_type gets set to an uninitialized local variable: sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create': sound/soc/soc-topology.c:1566:36: error: 'kcontrol_type' may be used uninitialized in this function [-Werror=maybe-uninitialized] I could not figure out which of the valid types would be appropriate here, so this sets it to '0', which is invalid but at least well-defined here. There is probably a better way to address the issue. Fixes: eea3dd4f ("ASoC: topology: Only free TLV for volume mixers of a widget") Signed-off-by:
Arnd Bergmann <arnd@arndb.de> Reported-by:
Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by:
Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 05 Dec, 2016 2 commits
-
-
Mengdong Lin authored
This patch will check the type of embedded controls for a widget, and only free the TLV of volume mixers. Bytes controls don't have TLV. Just free the private value which is used as struct soc_mixer_control for volume mixers or soc_bytes_ext for bytes controls. No need to cast to these types before freeing it. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
This patch can create multiple enumerated mixer controls for a widget. Previously topology kernel driver assumes a widget can have only one emumerated mixer control. We need to remove this restriction for Broxton. Its firmware modules (widgets) may need multiple enum controls based on the channel and MIC combination. No ABI change is needed. The ABI allows a widget to embed multiple controls. Reported-by:
G Kranthi <gudishax.kranthikumar@intel.com> Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 09 Nov, 2016 1 commit
-
-
Mengdong Lin authored
Check if the name strings are properly terminated, and only use valid name strings to find existing physical DAI links to configure. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 04 Nov, 2016 5 commits
-
-
Mengdong Lin authored
Add a new flag bit SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP to link flags. If a link is used for voice wake up, users can set this flag bit and topology will set the link's 'ignore_suspend' to true. This ABI update is backward compatible. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
Code refactoring. These functions and variables are for configuring physical DAIs, not only backend DAIs since users may not need DPCM. So remove 'be' from the function names, and rename variables 'be' to 'd' or 'dai'. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
Rename the ABI struct and type because they are for configuring physical DAIs, not only backend DAIs since users may not need DPCM: - Rename struct snd_soc_tplg_be_dai to snd_soc_tplg_dai. - Rename type SND_SOC_TPLG_TYPE_BE_DAI to SND_SOC_TPLG_TYPE_DAI. This code refactoring is backward compatible because: - Both layout of the struct and type value has no change. Kernel can find the same type value and map to same data layout. - This struct is not in ABI v4 at all. Now the user space uses ABI v4. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
Just code refactoring. The function soc_tplg_link_create() will create a front end link, not a physical link. So rename it to soc_tplg_fe_link_create(). Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
Topology will find an existing physical link (including BE link for DPCM) by checking its ID, name and stream name, and configure its physical audio format and flags. This support is backward compatible for old ABI v4. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 03 Nov, 2016 4 commits
-
-
Mengdong Lin authored
This is the remaining update to PCM ABI object of version 5. The flags will be applied to FE (Front End) links and can also be used by physical links. The private data is reserved for future extension, so offset update will add the private data size. Now user space is using ABI v4, and the previous patch "ASoC: topology: make PCM backward compatible from ABI v4" can assure the backward compatibility. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
Users start to use topology ABI from v4. ABI v5 updated existing manifest and PCM elements. Two previous patches can support these ABI updates in a backward compatible way. So if the topology file from user space is generated by ABI v4, kernel will no longer quit but continue parsing. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
User space may not always set a valid FE DAI driver's name, FE DAI link's name, stream name or cpu DAI name. In such cases, there are all ZERO in these name string buffers of a topology PCM object. This patch will only duplicate valid name strings for kernel FE DAI driver and DAI link when creating them from topology, and free the name strings when destroying them. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
Mengdong Lin authored
This patch adds support for old version 4 of PCMs (FE DAI & DAI links). Topology ABI v5 added new fields to stream caps and thus changed PCMs. Since user space may still uses v4, kernel will check the ABI version by comparing the object size. If user space uses v4 of PCMs, kernel will create the latest version of PCMs from the old version, and use the new version internally to create FE DAI & DAI links. Because these new created PCM elements will be freed later, kernel need duplicate the name strings of DAI driver and DAI links when creating them. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 28 Oct, 2016 1 commit
-
-
Mengdong Lin authored
This patch adds support for old version 4 of manifest. Topology ABI v5 added new fields to manifest while user space may still uses v4. So kernel will check the ABI version by comparing the object size. If user space uses v4 of manifest, kernel will create a latest version of manifest from the old one, and use the new one internally and free it later. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 22 Aug, 2016 1 commit
-
-
Mengdong Lin authored
Kernel struct snd_soc_pcm_stream, SoC PCM stream information, needs this field. Although current topology users don't configure this, we define it for future extension. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 11 Aug, 2016 1 commit
-
-
Wei Yongjun authored
Fix to return error code -ENOMEM instead of 0 when failed to create widget, as done elsewhere in this function. Fixes: 8a978234 ("ASoC: topology: Add topology core") Signed-off-by:
Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-
- 08 Aug, 2016 1 commit
-
-
Mengdong Lin authored
The platform driver may just specify the BE (Back End) DAI name and ID. And topology will find the existing BE DAI by its name and ID, and then configure its stream caps and flags. Signed-off-by:
Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by:
Mark Brown <broonie@kernel.org>
-