December 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v1 0/3] ASoC: last minute fixes
by Marcel Ziswiler 15 Jan '19

15 Jan '19

This series comes with some last minutes fixes and clean-up. Changes in v1: - Split from the Tegra series as suggested by Mark. - Fix issue in soc-core rather than working around it in tegra_sgtl5000. Marcel Ziswiler (3): ASoC: tegra_sgtl5000: fix device_node refcounting ASoC: soc-core: fix trivial checkpatch issues ASoC: soc-core: fix platform name vs. of_node assignement sound/soc/soc-core.c | 162 ++++++++++++++++++++++++--------------- sound/soc/tegra/tegra_sgtl5000.c | 17 +++- 2 files changed, 116 insertions(+), 63 deletions(-) -- 2.14.4

5 30

[alsa-devel] [PATCH 0/4] ASoC: wm8904: prepare for use from audio-graph-card
by Michał Mirosław 13 Jan '19

13 Jan '19

First two patches make wm8904 usable from audio-graph-card. Third is a simple micro-optimization of driver-data usage. Last fixes register access with disabled SYSCLK. Tested on custom SAMA5D2 board. Michał Mirosław (4): ASoC: wm8904: make the driver visible in Kconfig ASoC: wm8904: Automatically enable FLL when selected ASoC: wm8904: save model id directly in of_device_id.data ASoC: wm8904: enable MCLK in STANDBY sound/soc/codecs/Kconfig | 3 ++- sound/soc/codecs/wm8904.c | 42 ++++++++++++++++++++++++++++----------- sound/soc/codecs/wm8904.h | 2 +- 3 files changed, 33 insertions(+), 14 deletions(-) -- 2.19.2

3 10

[alsa-devel] [PATCH] ASoC: Intel: sst: Delay machine device creation until after initialization
by Stephan Gerhold 10 Jan '19

10 Jan '19

Right now, the machine devices are created early, before the SST context is initialized. This means that SST might not be fully initialized if sst_acpi_probe() fails later on (e.g. after sst_platform_get_resources() if the IRQ does not exist). However, at least sst-mfld-platform assumes that sst_register_dsp() was called to set the (global) "sst" device pointer, which happens only later in sst_acpi_probe() when sst_context_init() is called. This may cause a NULL pointer dereference later when the ALSA device is first opened: BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 0 PID: 790 Comm: pulseaudio Not tainted 4.20.0-rc6-mainline-00161-g6531e115b7ab #1 Hardware name: ASUSTeK COMPUTER INC. ME176C/ME176C, BIOS 5.6.5 09/16/2015 RIP: 0010:sst_handle_vb_timer+0x61/0x1b0 [snd_soc_sst_atom_hifi2_platform] Code: 44 24 04 e9 84 00 00 00 31 c9 c7 04 24 ff ff ff ff 66 89 4c 24 06 84 db 0f 84 90 00 00 00 48 8b 05 c4 23 01 00 be 01 00 00 00 <48> 8b 78 08 48 8b 40 10 48 8b 40 48 e8 2e 5e d7 f0 89 c3 85 c0 78 RSP: 0018:ffff9d968099fa30 EFLAGS: 00010202 RAX: 0000000000000000 RBX: 0000000000000001 RCX: 0000000000000000 RDX: 0000000080000001 RSI: 0000000000000001 RDI: 00000000ffffffff RBP: ffff968d33384618 R08: 0000000000000001 R09: 00000000000002e3 R10: ffff968d333a0800 R11: 0000000000000000 R12: ffff968d34bc7c00 R13: ffff968d333a3eb0 R14: 0000000000000001 R15: ffff968d333a08c0 FS: 00007f63a7e7b200(0000) GS:ffff968d37600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000008 CR3: 00000000297b8000 CR4: 00000000001006f0 Call Trace: sst_enable_ssp+0x24/0x40 [snd_soc_sst_atom_hifi2_platform] soc_pcm_open+0xeb/0x960 [snd_soc_core] ? __debugfs_create_file+0xcd/0x120 dpcm_be_dai_startup+0x183/0x3c0 [snd_soc_core] dpcm_fe_dai_open+0x10c/0xab0 [snd_soc_core] snd_pcm_open_substream+0x7f/0x140 [snd_pcm] snd_pcm_open+0xe6/0x220 [snd_pcm] ? wake_up_q+0x70/0x70 snd_pcm_playback_open+0x3d/0x70 [snd_pcm] chrdev_open+0xa3/0x1b0 ? cdev_put.part.0+0x20/0x20 do_dentry_open+0x12f/0x350 path_openat+0x2d1/0x14e0 ? inotify_handle_event+0x17b/0x1e0 do_filp_open+0x93/0x100 ? snd_card_file_remove+0x14b/0x170 [snd] ? __check_object_size+0x102/0x189 ? _raw_spin_unlock+0x12/0x30 do_sys_open+0x186/0x210 do_syscall_64+0x55/0x160 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f63a992f4c2 Code: 25 00 00 41 00 3d 00 00 41 00 74 4c 48 8d 05 85 70 0d 00 8b 00 85 c0 75 6d 89 f2 b8 01 01 00 00 48 89 fe bf 9c ff ff ff 0f 05 <48> 3d 00 f0 ff ff 0f 87 a2 00 00 00 48 8b 4c 24 28 64 48 33 0c 25 RSP: 002b:00007ffe71196b70 EFLAGS: 00000246 ORIG_RAX: 0000000000000101 RAX: ffffffffffffffda RBX: 0000000000080802 RCX: 00007f63a992f4c2 RDX: 0000000000080802 RSI: 00007ffe71196d20 RDI: 00000000ffffff9c RBP: 00000000ffffffff R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007ffe71196c00 R13: 0000000000000004 R14: 00007ffe71196d20 R15: 0000558466055a80 CR2: 0000000000000008 ---[ end trace 34534a02650ee26c ]--- This can be avoided if the machine device creation is delayed in sst_acpi_probe() until after sst_context_init(), when sst_register_dsp() is guaranteed to have already been called. Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> --- An other option to fix this would be to add proper NULL checks in the probe method of sst-mfld-platform and/or sst_enable_ssp(). Maybe this should be done additionally, but at least in my opinion there is not much point in registering the machine devices if they end up being broken anyway. sound/soc/intel/atom/sst/sst_acpi.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index ac542535b9d5..493d32923815 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -345,6 +345,18 @@ static int sst_acpi_probe(struct platform_device *pdev) mach->mach_params.acpi_ipc_irq_index = pdata->res_info->acpi_ipc_irq_index; + /* Fill sst platform data */ + ctx->pdata = pdata; + strcpy(ctx->firmware_name, mach->fw_filename); + + ret = sst_platform_get_resources(ctx); + if (ret) + return ret; + + ret = sst_context_init(ctx); + if (ret < 0) + return ret; + plat_dev = platform_device_register_data(dev, pdata->platform, -1, NULL, 0); if (IS_ERR(plat_dev)) { @@ -365,18 +377,6 @@ static int sst_acpi_probe(struct platform_device *pdev) return PTR_ERR(mdev); } - /* Fill sst platform data */ - ctx->pdata = pdata; - strcpy(ctx->firmware_name, mach->fw_filename); - - ret = sst_platform_get_resources(ctx); - if (ret) - return ret; - - ret = sst_context_init(ctx); - if (ret < 0) - return ret; - sst_configure_runtime_pm(ctx); platform_set_drvdata(pdev, ctx); return ret; -- 2.20.0

2 4

[alsa-devel] [PATCH v2 0/2] ALSA: HDAudio: enable dynamic selection between legacy and Skylake drivers
by Pierre-Louis Bossart 09 Jan '19

09 Jan '19

Use detection logic based on the PCI class/subclass/prog-if in the HDaudio legacy probe, and add a module parameter to bypass or force the automatic detection should it ever fail (or in case of missing firmware or topology files) This patchset was tested on 1. an SKL HP device with the DSP disabled 2. a WHL Acer Swift3 laptop 3. APL NUC6 4. KBL NUC7 5 reboot tests were done for each device with the DSP presence detected reliably. The "pci_binding" parameter was also tested on the WHL device. The dynamic selection adds about 5ms worst case. [ 2.813741] snd_hda_intel 0000:00:1f.3: The DSP is enabled on this platform, aborting probe [ 2.850588] snd_soc_skl 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040100 The SOF driver will use exactly the same mechanism, and add a mutual exclusion with the Skylake/SST driver to avoid having 3 drivers for the same PCI ID. Two is complicated enough. Changes since v1 (Feedback from Takashi) a) added explanations and renamed Kconfigs to SND_HDA_INTEL_DSP_DETECTION_XYZ b) less verbose dev_info c) fixed pci_binding parameter Pierre-Louis Bossart (2): ALSA: HD-Audio: SKL+: abort probe if DSP is present and Skylake driver selected ALSA: HD-Audio: SKL+: force HDaudio legacy or SKL+ driver selection include/sound/hdaudio.h | 6 ++++ sound/pci/hda/Kconfig | 62 ++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 54 +++++++++++++++++++++++++---- sound/soc/intel/Kconfig | 6 ++++ sound/soc/intel/skylake/skl.c | 48 ++++++++++++++++++-------- 6 files changed, 155 insertions(+), 23 deletions(-) base-commit: ba26f635bf7253b42b08135152b18a2c8082abb7 -- 2.17.1

3 5

[alsa-devel] ASoC: Intel: sst: Missing IRQ at index 5 on BYT-T device
by Stephan Gerhold 09 Jan '19

09 Jan '19

Hi, I have an Intel Bay Trail (BYT-T) tablet that was originally shipped with Android. With the right quirks, bytcr-rt5640 is working fine, but there is a problem in sst_acpi.c that is preventing it from working with a mainline kernel: Even though this is a BYT-T device, there is no IRQ at index 5 in the ACPI DSDT table. This means that SST will fail to probe, and actually leads to a NULL pointer dereference later when the ALSA device is first opened. (I have submitted a possible solution for this as "[PATCH] ASoC: Intel: sst: Delay machine device creation until after initialization") The correct IRQ is actually located on index 0, just like it is already being used for BYT-CR devices. So if I force is_byt_cr() to return TRUE, everything works as expected. Here is the relevant part from the ACPI DSDT table: Name (_ADR, Zero) // _ADR: Address Name (_HID, "80860F28" /* Intel SST Audio DSP */) // _HID: Hardware ID Name (_CID, "80860F28" /* Intel SST Audio DSP */) // _CID: Compatible ID Name (_DDN, "Intel(R) Low Power Audio Controller - 80860F28") // _DDN: DOS Device Name Name (_SUB, "80867270") // _SUB: Subsystem ID Name (_UID, One) // _UID: Unique ID Name (RBUF, ResourceTemplate () { Memory32Fixed (ReadWrite, 0x12345678, // Address Base 0x00200000, // Address Length _Y08) Memory32Fixed (ReadWrite, 0xFE830000, // Address Base 0x00001000, // Address Length _Y09) Memory32Fixed (ReadWrite, 0x55AA55AA, // Address Base 0x00200000, // Address Length _Y0A) Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, ) { 0x0000001D, } }) Unlike many of the other DSDT dumps I've looked at, there is only one interrupt listed. Full ACPI DSDT table is at [1]. Since there is no IRQ at index 5, platform_get_irq will return -ENXIO. Couldn't we fall back to index 0 in this case? I would say that if the seemingly "correct" IRQ at index 5 does not even exist, we still have a better chance of picking the right one if we try the one at index 0. Or we could check the number of interrupts that are actually available. The other option would be some kind of DMI-based quirk, but personally I would prefer to avoid that.. (In my opinion, there is way too much device specific code with the quirks etc already...) Or do you have any other suggestions? Thanks, Stephan [1]: https://github.com/me176c-dev/me176c-acpi/blob/f48c78c11b0819b899f988407b6e…

5 26

[alsa-devel] [PATCH] ASoC: Intel: Boards: move the codec PLL configuration to _init
by mac.chiang＠intel.com 09 Jan '19

09 Jan '19

From: Mac Chiang <mac.chiang(a)intel.com> move the codec PLL to rt5682_codec_init, because codec only need to config the clock source/PLL once. As the result, remove the platform_clock_controls since no need to control clock anymore. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- sound/soc/intel/boards/glk_rt5682_max98357a.c | 45 +++++---------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c index c74c4f1..8f83b18 100644 --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c @@ -55,39 +55,6 @@ enum { GLK_DPCM_AUDIO_HDMI3_PB, }; -static int platform_clock_control(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct snd_soc_dai *codec_dai; - int ret = 0; - - codec_dai = snd_soc_card_get_codec_dai(card, GLK_REALTEK_CODEC_DAI); - if (!codec_dai) { - dev_err(card->dev, "Codec dai not found; Unable to set/unset codec pll\n"); - return -EIO; - } - - if (SND_SOC_DAPM_EVENT_OFF(event)) { - ret = snd_soc_dai_set_sysclk(codec_dai, 0, 0, 0); - if (ret) - dev_err(card->dev, "failed to stop sysclk: %d\n", ret); - } else if (SND_SOC_DAPM_EVENT_ON(event)) { - ret = snd_soc_dai_set_pll(codec_dai, 0, RT5682_PLL1_S_MCLK, - GLK_PLAT_CLK_FREQ, RT5682_PLL_FREQ); - if (ret < 0) { - dev_err(card->dev, "can't set codec pll: %d\n", ret); - return ret; - } - } - - if (ret) - dev_err(card->dev, "failed to start internal clk: %d\n", ret); - - return ret; -} - static const struct snd_kcontrol_new geminilake_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -102,14 +69,10 @@ static const struct snd_soc_dapm_widget geminilake_widgets[] = { SND_SOC_DAPM_SPK("HDMI1", NULL), SND_SOC_DAPM_SPK("HDMI2", NULL), SND_SOC_DAPM_SPK("HDMI3", NULL), - SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, - platform_clock_control, SND_SOC_DAPM_PRE_PMU | - SND_SOC_DAPM_POST_PMD), }; static const struct snd_soc_dapm_route geminilake_map[] = { /* HP jack connectors - unknown if we have jack detection */ - { "Headphone Jack", NULL, "Platform Clock" }, { "Headphone Jack", NULL, "HPOL" }, { "Headphone Jack", NULL, "HPOR" }, @@ -117,7 +80,6 @@ static const struct snd_soc_dapm_route geminilake_map[] = { { "Spk", NULL, "Speaker" }, /* other jacks */ - { "Headset Mic", NULL, "Platform Clock" }, { "IN1P", NULL, "Headset Mic" }, /* digital mics */ @@ -177,6 +139,13 @@ static int geminilake_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_jack *jack; int ret; + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5682_PLL1_S_MCLK, + GLK_PLAT_CLK_FREQ, RT5682_PLL_FREQ); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + /* Configure sysclk for codec */ ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL1, RT5682_PLL_FREQ, SND_SOC_CLOCK_IN); -- 2.7.4

3 2

[alsa-devel] [PATCH v3 0/9] ASoC: sun4i-i2s: Updates to the driver
by codekipper＠gmail.com 09 Jan '19

09 Jan '19

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, here is a patch series to add some improvements to the sun4i-i2s driver found whilst getting slave clocking and hdmi audio working on the newer SoCs. Since the last push there has been some activity getting surround sound working and this is included. The functionality included with the new patch set has been extended to cover more sample resolutions, multi-lane data output for HDMI audio and some bug fixes that have been discovered along the way. I can see more usage of the tdm property since I last attempted to push these patches and the examples currently in mainline sort of the opposite to what I'm trying to achieve. When we first started looking at the i2s driver, the codecs that we were using allowed for the frame width to be determined based on the sampling resolution but in most use cases it seems that a fixed width is required(my highest priority should be to get HDMI audio support in). We're using the tdm property to override the old way to calculate the frame width. What I've seen in what has already been mainlined is that the i2s driver has a frame width that is fixed to 32 bits and this can be overridden using the tdm property. Anyway, I've moved the more controversial patches to the top of the stack as I'm expecting feedback. Have a great Xmas and New Year, BR, CK --- v3 changes compared to v2 are: - added back slave mode changes - added back the use of tdm properties - changes to regmap and caching - removed loopback functionality - fixes to the channel offset mask v2 changes compared to v1 are: - removed slave mode changes which didn't set mclk and bclk div. - removed use of tdm and now use a dedicated property. - fix commit message to better explain reason for sign extending - add divider calculations for newer SoCs. - add support for multi-lane i2s data output. - add support for 20, 24 and 32 bit samples. - add loopback property so blocks can be tested without a codec. --- Marcus Cooper (9): ASoC: sun4i-i2s: Adjust regmap settings ASoC: sun4i-i2s: Add regmap field to sign extend sample ASoc: sun4i-i2s: Add 20, 24 and 32 bit support ASoC: sun4i-i2s: Fix offset mask ASoC: sun4i-i2s: Correct divider calculations ASoC: sun4i-i2s: Add multi-lane functionality ASoC: sun4i-i2s: Do not divide clocks when slave ASoC: sun4i-i2s: Add set_tdm_slot functionality ASoC: sun4i-i2s: Add multichannel functionality sound/soc/sunxi/sun4i-i2s.c | 399 ++++++++++++++++++++++++------------ 1 file changed, 267 insertions(+), 132 deletions(-) -- 2.20.1

4 19

[alsa-devel] [PATCH 0/2] ASoC: soc-core: add snd_soc_of_lookup_component()
by Rohit kumar 09 Jan '19

09 Jan '19

Platform DAI component probe is not called if it is not present in component list during sound card registration. Add snd_soc_of_lookup_component() to get component info from device_node. This can be used by machine driver to make sure that card components are registered before calling snd_soc_register_card(). Ajit Pandey (2): ASoC: soc-core: add snd_soc_of_lookup_component() ASoC: qcom: defer probe if platform dai is not registered include/sound/soc.h | 1 + sound/soc/qcom/common.c | 9 +++++++++ sound/soc/soc-core.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2 4

[alsa-devel] [PATCH - ALSA JACK plugin 0/2] jack: Speedup of start/stop/recovery
by twischer＠de.adit-jv.com 08 Jan '19

08 Jan '19

Hi all, the following patches minimizes the delay of calling snd_pcm_start() and snd_pcm_stop() for the ALSA JACK plugin. This also makes an Xrun recovery faster. Best regards Timo

2 4

[alsa-devel] [PATCH v2 0/7] Asoc: Various Intel rt5651 patches
by Hans de Goede 07 Jan '19

07 Jan '19

Hi All, Here is a v2 of my previous set with various Intel rt5651 patches. This version contains a small fix to: [PATCH v2 6/7] ASoC: Intel: bytcr_rt5651: Add support for jack-detect I forgot to pass the gpio to snd_soc_component_set_jack from the resume handler too (instead of only from the init function). Other then that there are no changes, so I've kept Pierre-Louis' Acked-by for the entire series. Regards, Hans

2 8