April 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v5 00/21] ASoC: Sound Open Firmware (SOF) - Intel support
by Pierre-Louis Bossart 27 Apr '19

27 Apr '19

This patch series introduces the support for Intel devices (Baytrail, CherryTrail, Broadwell, ApolloLake, GeminiLake, CannonLake, IceLake). Support for Haswell, Skylake and KabyLake is incomplete at the moment and is not shared for now. The series starts with the 'legacy' devices, then all the more recent ones and concludes with ACPI/PCI hooks. SKL+ platforms can be compiled without HDaudio link/codec support, in which case the hdac library is not used. When support for HDMI or HDaudio codecs is selected, parts of this library are used. A small set of machine drivers supported by SOF is now provided as part of this series, more to follow. Support for SPI-based devices, compressed streams is also not provided for now since it's not ready for upstream just yet. Thank you for reviews and comments, we appreciate the time spent commenting on this large patchset. Thanks in particular to Alan Cox and Andy Shevchenko for their comments on an earlier version. Changes since v4: Feedback from Andy: Rename EDISON as MERRIFIELD, byt_pci_probe as tng_pci_probe Feedback from Takashi: Remove superfluous initializations and casts Tabify Kconfigs Fix dependency on SND_DMA_SGBUFF Other updates: Major IPC rework (Intel-specific parts moved out of the core) Fix NOCODEC/HDA compatibility Fix period bytes calculation Fix CTX_SAVE handling (do not read mailbox which can be powered off) Fix ROM message handling Drop unexpected IPC replies Add prepare for BE dailink Fix typos in comments Changes since v3: Removed Haswell, Skylake and Kabylake support (code is not tested or is still under development). These devices will be re-added when there is functional firmware and for Skylake/Kabylake a signed version of the firmware usable on existing platforms. Added support for existing machine drivers when relevant (more machine drivers will be added in next batch) Fixed hardware programming sequences (ROM init timeout, HDaudio capture, simultaneous capture and playback, DMA preload) Avoid reading IPC reply on CTX_SAVE reply since memory windows might be powered off. Simplified NOCODEC support, now mutually exclusive with HDaudio link to avoid suspend/resume issues. Changes since v2: Addressed dozens of comments from Takashi Iwai, Mark Brown, Andy Shevchenko, Daniel Baluta (Thanks!) Transition to new display power management Fixed suspend issues Optimized register polling, better handling of timeouts and firmware download retries Detect number of HDaudio codec and select machine driver accordingly Added workqueue based probe for HDaudio (dependency on modules) Fixed platform name override and conflicts with DT deferred probe changes Added prefix for firmware and topology files and module arguments Split Baytrail and Edison Fixed warnings (smatch, cppcheck) Guennadi Liakhovetski (1): ASoC: SOF: Intel: Add legacy IPC support Keyon Jie (2): ASoC: SOF: Intel: Add hda-bus support and initialization ASoC: SOF: Intel: add SKL+ platform DAIs Liam Girdwood (15): ASoC: SOF: Intel: Add BYT, CHT and BSW DSP HW support. ASoC: SOF: Intel: Add BDW HW DSP support ASoC: SOF: Intel: Add APL/CNL HW DSP support ASoC: SOF: Intel: Add HDA controller for Intel DSP ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations ASoC: SOF: Intel: Add Intel specific HDA IPC mechanisms. ASoC: SOF: Intel: Add Intel specific HDA firmware loader ASoC: SOF: Intel: Add Intel specific HDA PCM operations ASoC: SOF: Intel: Add Intel specific HDA stream operations ASoC: SOF: Intel: Add Intel specific HDA trace operations ASoC: SOF: Intel: Add platform differentiation for APL and CNL ASoC: SOF: Add ACPI device support ASoC: SOF: Add PCI device support ASoC: SOF: Add Build support for SOF core and Intel drivers ASoC: Intel: Make sure BDW based machine drivers build for SOF Pierre-Louis Bossart (3): ASoC: SOF: Intel: Add support for HDAudio codecs ASoC: Intel: Kconfig: expose common option between SST and SOF drivers ASoC: Intel: select relevant machine drivers for SOF sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/intel/Kconfig | 7 +- sound/soc/intel/boards/Kconfig | 22 +- sound/soc/intel/boards/bdw-rt5677.c | 4 + sound/soc/intel/boards/broadwell.c | 4 + sound/soc/sof/Kconfig | 141 +++++ sound/soc/sof/Makefile | 18 + sound/soc/sof/intel/Kconfig | 230 ++++++++ sound/soc/sof/intel/Makefile | 19 + sound/soc/sof/intel/apl.c | 109 ++++ sound/soc/sof/intel/bdw.c | 713 +++++++++++++++++++++++ sound/soc/sof/intel/byt.c | 874 ++++++++++++++++++++++++++++ sound/soc/sof/intel/cnl.c | 249 ++++++++ sound/soc/sof/intel/hda-bus.c | 108 ++++ sound/soc/sof/intel/hda-codec.c | 171 ++++++ sound/soc/sof/intel/hda-ctrl.c | 181 ++++++ sound/soc/sof/intel/hda-dai.c | 351 +++++++++++ sound/soc/sof/intel/hda-dsp.c | 455 +++++++++++++++ sound/soc/sof/intel/hda-ipc.c | 458 +++++++++++++++ sound/soc/sof/intel/hda-loader.c | 371 ++++++++++++ sound/soc/sof/intel/hda-pcm.c | 240 ++++++++ sound/soc/sof/intel/hda-stream.c | 692 ++++++++++++++++++++++ sound/soc/sof/intel/hda-trace.c | 94 +++ sound/soc/sof/intel/hda.c | 671 +++++++++++++++++++++ sound/soc/sof/intel/hda.h | 560 ++++++++++++++++++ sound/soc/sof/intel/intel-ipc.c | 92 +++ sound/soc/sof/intel/shim.h | 183 ++++++ sound/soc/sof/sof-acpi-dev.c | 312 ++++++++++ sound/soc/sof/sof-pci-dev.c | 373 ++++++++++++ 30 files changed, 7696 insertions(+), 8 deletions(-) create mode 100644 sound/soc/sof/Kconfig create mode 100644 sound/soc/sof/Makefile create mode 100644 sound/soc/sof/intel/Kconfig create mode 100644 sound/soc/sof/intel/Makefile create mode 100644 sound/soc/sof/intel/apl.c create mode 100644 sound/soc/sof/intel/bdw.c create mode 100644 sound/soc/sof/intel/byt.c create mode 100644 sound/soc/sof/intel/cnl.c create mode 100644 sound/soc/sof/intel/hda-bus.c create mode 100644 sound/soc/sof/intel/hda-codec.c create mode 100644 sound/soc/sof/intel/hda-ctrl.c create mode 100644 sound/soc/sof/intel/hda-dai.c create mode 100644 sound/soc/sof/intel/hda-dsp.c create mode 100644 sound/soc/sof/intel/hda-ipc.c create mode 100644 sound/soc/sof/intel/hda-loader.c create mode 100644 sound/soc/sof/intel/hda-pcm.c create mode 100644 sound/soc/sof/intel/hda-stream.c create mode 100644 sound/soc/sof/intel/hda-trace.c create mode 100644 sound/soc/sof/intel/hda.c create mode 100644 sound/soc/sof/intel/hda.h create mode 100644 sound/soc/sof/intel/intel-ipc.c create mode 100644 sound/soc/sof/intel/shim.h create mode 100644 sound/soc/sof/sof-acpi-dev.c create mode 100644 sound/soc/sof/sof-pci-dev.c -- 2.17.1

3 43

[alsa-devel] [PATCH 0/3] Add runtime PM for SAI digital audio interface
by Daniel Baluta 27 Apr '19

27 Apr '19

First patch fixes a bug by correctly setting is_slave_mode, then second patch adds support for runtime PM and finally 3rd patch moves clock handling from startup/shtudown function to runtime PM handlers. Changes since v1: - added patch 1 - added fsl_sai_remove in order to call pm_runtime_disable - only disable/enable mclk when SAI in master mode. Daniel Baluta (2): ASoC: fsl_sai: Update is_slave_mode with correct value ASoC: fsl_sai: Add support for runtime pm Shengjiu Wang (1): ASoC: fsl_sai: Move clock operation to PM runtime sound/soc/fsl/fsl_sai.c | 84 +++++++++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 15 deletions(-) -- 2.17.1

5 13

Re: [alsa-devel] [PATCH V3] ASoC: fsl_esai: Add pm runtime function
by S.j. Wang 27 Apr '19

27 Apr '19

Hi Mark > > On Mon, Apr 22, 2019 at 02:31:55AM +0000, S.j. Wang wrote: > > Add pm runtime support and move clock handling there. > > Close the clocks at suspend to reduce the power consumption. > > > > fsl_esai_suspend is replaced by pm_runtime_force_suspend. > > fsl_esai_resume is replaced by pm_runtime_force_resume. > > This doesn't apply against current code, please check and resend. Which branch are you using? I tried for-next and for-linus, both Are successful applied. Best regards Wang shengjiu

2 1

[alsa-devel] Help with cross compilation of alsa-lib.
by Mathias Nielsen 27 Apr '19

27 Apr '19

Hi. I have made a small Go app (https://github.com/Lynges/susimup). It is a simple music player for the console and one of the libraries I use has alsa as a dependency on linux. I would really like to have cross compilation working so that I might provide binaries for the various platforms. I have tried getting it working using xgo (https://github.com/karalabe/xgo) and it solves the problem for both windows and macos, but on linux I have to get alsa-lib injected and compiled. I have created an SO question with some more details here: ( https://stackoverflow.com/questions/55656194/xgo-cross-compile-not-working-… ) I realize that I am asking no small thing unless someone on this list is very familiar with both xgo and alsa, but I could really use some help getting this working and I have spent quite a lot of time searching for other solutions and found nothing so I guess it would be helpful to others as well as my self. I do not have a whole lot of experience getting cross compilation for C working and the fact that the process is somewhat obscured by xgo does not make it any easier. One thing I have not tried yet is just forking xgo and using a different version of their docker image that then has the alsa packages installed with multiarch, but I have no idea how to make that work or if it even could work. Any more information I can provide, please dont hold back. -- Best regards Mathias Nielsen

1 0

[alsa-devel] Will we ever see a low latency/high performance PCM api for usb, firewire, avb ?
by Ralf Beck 26 Apr '19

26 Apr '19

Subject says it all. During the Dec/Jan period i did some USB patches for the Motu AVB series and a trivial alsa driver to connect my Motu via AVB for a single i/o stream. So i discovered how totally unsuitable the mmapped ringbuffer model of alsa is for the above types of interfaces. Is there any intention to change this ? I've read that this has already been discussed during miniconf 2017 (USB) and 2018 (AVB). Any results?

3 3

[alsa-devel] [PATCH] ASoC: da7213: fix DAI_CLK_EN register bit overwrite
by Logesh Kolandavel 26 Apr '19

26 Apr '19

From: Logesh <logesh.kolandavel(a)timesys.com> If the da7213 codec is configured as Master with the DAPM power down delay time set, 'snd_soc_component_write' function overwrites the DAI_CLK_EN bit of DAI_CLK_MODE register which leads to audio play only once until it re-initialize after codec power up. Signed-off-by: Logesh <logesh.kolandavel(a)timesys.com> --- sound/soc/codecs/da7213.c | 4 +++- sound/soc/codecs/da7213.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 92d006a5283e..306e01684bda 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1305,7 +1305,9 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) /* By default only 64 BCLK per WCLK is supported */ dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64; - snd_soc_component_write(component, DA7213_DAI_CLK_MODE, dai_clk_mode); + snd_soc_component_update_bits(component, DA7213_DAI_CLK_MODE, + DA7213_DAI_CLK_POL_MASK | DA7213_DAI_WCLK_POL_MASK, + dai_clk_mode); snd_soc_component_update_bits(component, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK, dai_ctrl); snd_soc_component_write(component, DA7213_DAI_OFFSET, dai_offset); diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h index 5a78dba1dcb5..9d31efc3cfe5 100644 --- a/sound/soc/codecs/da7213.h +++ b/sound/soc/codecs/da7213.h @@ -181,7 +181,9 @@ #define DA7213_DAI_BCLKS_PER_WCLK_256 (0x3 << 0) #define DA7213_DAI_BCLKS_PER_WCLK_MASK (0x3 << 0) #define DA7213_DAI_CLK_POL_INV (0x1 << 2) +#define DA7213_DAI_CLK_POL_MASK (0x1 << 2) #define DA7213_DAI_WCLK_POL_INV (0x1 << 3) +#define DA7213_DAI_WCLK_POL_MASK (0x1 << 3) #define DA7213_DAI_CLK_EN_MASK (0x1 << 7) /* DA7213_DAI_CTRL = 0x29 */ -- 2.21.0

2 1

[alsa-devel] [PATCH v3 0/3] Add runtime PM for SAI digital audio interface
by Daniel Baluta 26 Apr '19

26 Apr '19

First patch fixes a bug by correctly setting is_slave_mode, then second patch adds support for runtime PM and finally 3rd patch moves clock handling from startup/shtudown function to runtime PM handlers. Changes since v2: (after Viorel's comments) - no need to check for is_slave_mode when enabling/disabling the clocks because sai->mclk_streams is only set when SAI is in master mode. Changes since v1: (after Nicolin's comments) - added patch 1 - added fsl_sai_remove in order to call pm_runtime_disable - only disable/enable mclk when SAI in master mode. Daniel Baluta (2): ASoC: fsl_sai: Update is_slave_mode with correct value ASoC: fsl_sai: Add support for runtime pm Shengjiu Wang (1): ASoC: fsl_sai: Move clock operation to PM runtime sound/soc/fsl/fsl_sai.c | 78 +++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 15 deletions(-) -- 2.17.1

3 5

[alsa-devel] [PATCH v2 1/2] ASoC: simple-card-utils: add asoc_simple_parse_pin_switches()
by Paul Cercueil 26 Apr '19

26 Apr '19

This function is a helper that permits to create pin switch controls for a list of widgets whose names are listed in the PREFIX "pin-switches" devicetree property. Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- Notes: v2: - Rebase on top of for-next - Rename to asoc_simple_parse_pin_switches() include/sound/simple_card_utils.h | 2 + sound/soc/generic/simple-card-utils.c | 57 +++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 67dc3ee6ed01..3429888347e7 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -133,6 +133,8 @@ int asoc_simple_parse_routing(struct snd_soc_card *card, char *prefix); int asoc_simple_parse_widgets(struct snd_soc_card *card, char *prefix); +int asoc_simple_parse_pin_switches(struct snd_soc_card *card, + char *prefix); int asoc_simple_init_jack(struct snd_soc_card *card, struct asoc_simple_jack *sjack, diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index db1458a19985..f4c6375d11c7 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -430,6 +430,63 @@ int asoc_simple_parse_widgets(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(asoc_simple_parse_widgets); +int asoc_simple_parse_pin_switches(struct snd_soc_card *card, + char *prefix) +{ + const unsigned int nb_controls_max = 16; + const char **strings, *control_name; + struct snd_kcontrol_new *controls; + struct device *dev = card->dev; + unsigned int i, nb_controls; + char prop[128]; + int ret; + + if (!prefix) + prefix = ""; + + snprintf(prop, sizeof(prop), "%s%s", prefix, "pin-switches"); + + if (!of_property_read_bool(dev->of_node, prop)) + return 0; + + strings = devm_kcalloc(dev, nb_controls_max, + sizeof(*strings), GFP_KERNEL); + if (!strings) + return -ENOMEM; + + ret = of_property_read_string_array(dev->of_node, prop, + strings, nb_controls_max); + if (ret < 0) + return ret; + + nb_controls = (unsigned int)ret; + + controls = devm_kcalloc(dev, nb_controls, + sizeof(*controls), GFP_KERNEL); + if (!controls) + return -ENOMEM; + + for (i = 0; i < nb_controls; i++) { + control_name = devm_kasprintf(dev, GFP_KERNEL, + "%s Switch", strings[i]); + if (!control_name) + return -ENOMEM; + + controls[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; + controls[i].name = control_name; + controls[i].info = snd_soc_dapm_info_pin_switch; + controls[i].get = snd_soc_dapm_get_pin_switch; + controls[i].put = snd_soc_dapm_put_pin_switch; + controls[i].private_value = (unsigned long)strings[i]; + } + + card->controls = controls; + card->num_controls = nb_controls; + + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_parse_pin_switches); + int asoc_simple_init_jack(struct snd_soc_card *card, struct asoc_simple_jack *sjack, int is_hp, char *prefix) -- 2.21.0.593.g511ec345e18

2 3

[alsa-devel] [PATCH] ASoC: mediatek: btcvsd fix irq mask
by KaiChieh Chuang 26 Apr '19

26 Apr '19

disable = 1 enable = 0 prevent AP wake up, when not AP BTSCO scenario Signed-off-by: KaiChieh Chuang <kaichieh.chuang(a)mediatek.com> --- sound/soc/mediatek/common/mtk-btcvsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c index 6784e35..b918f79 100644 --- a/sound/soc/mediatek/common/mtk-btcvsd.c +++ b/sound/soc/mediatek/common/mtk-btcvsd.c @@ -194,13 +194,13 @@ struct mtk_btcvsd_snd_time_buffer_info { static void mtk_btcvsd_snd_irq_enable(struct mtk_btcvsd_snd *bt) { regmap_update_bits(bt->infra, bt->infra_misc_offset, - bt->conn_bt_cvsd_mask, bt->conn_bt_cvsd_mask); + bt->conn_bt_cvsd_mask, 0); } static void mtk_btcvsd_snd_irq_disable(struct mtk_btcvsd_snd *bt) { regmap_update_bits(bt->infra, bt->infra_misc_offset, - bt->conn_bt_cvsd_mask, 0); + bt->conn_bt_cvsd_mask, bt->conn_bt_cvsd_mask); } static void mtk_btcvsd_snd_set_state(struct mtk_btcvsd_snd *bt, -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: fsl_sai: Add missing return 0 in remove()
by Nicolin Chen 26 Apr '19

26 Apr '19

Build warning being reported: sound/soc/fsl/fsl_sai.c: In function 'fsl_sai_remove': sound/soc/fsl/fsl_sai.c:921:1: warning: no return statement in function returning non-void [-Wreturn-type] So this patch just adds a "return 0" to fix it. Fixes: 812ad463e089 ("ASoC: fsl_sai: Add support for runtime pm") Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- sound/soc/fsl/fsl_sai.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 26c27dc..8593269 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -918,6 +918,8 @@ static int fsl_sai_probe(struct platform_device *pdev) static int fsl_sai_remove(struct platform_device *pdev) { pm_runtime_disable(&pdev->dev); + + return 0; } static const struct of_device_id fsl_sai_ids[] = { -- 2.7.4

3 2