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

[alsa-devel] Issue in alsa when dma complete race with pcm release
by Shengjiu Wang 15 Jul '15

15 Jul '15

Hi alsa-devel There maybe a issue in ALSA when dma complete race with snd_pcm_release. The pcm release and dma complete are in different thread. There is occasion that dmaengine_pcm_dma_complete() is called too late, some memory has been freed, the prtd is null. Then there is kernel dump. Is there any solution for this issue? Thanks. Best regards wang shengjiu

2 9

[alsa-devel] [PATCH] ALSA: hda - Fix Skylake codec timeouts
by David Henningsson 15 Jul '15

15 Jul '15

When the controller is powered up but the HDMI codec is powered down on Skylake, the power well is turned off. When the codec is then powered up again, we need to poke the codec a little extra to make sure it wakes up. Otherwise we'll get sad "no response from codec" messages and broken audio. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> Tested-by: Woodrow Shen <woodrow.shen(a)canonical.com> --- * It would good to have an ack from Intel on this patch, since they have better hardware knowledge than I. * Also I haven't really kept track of all recent reorganisation of the hda driver so I'm not totally sure how many kernels back (if any) that this applies to sound/pci/hda/hda_intel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ca151b4..872e9a7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -567,9 +567,17 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev) /* Enable/disable i915 display power for the link */ static int azx_intel_link_power(struct azx *chip, bool enable) { + int err; struct hdac_bus *bus = azx_bus(chip); - return snd_hdac_display_power(bus, enable); + err = snd_hdac_display_power(bus, enable); + if (err < 0) + return err; + if (enable && (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)) { + snd_hdac_set_codec_wakeup(bus, true); + snd_hdac_set_codec_wakeup(bus, false); + } + return 0; } /* -- 1.9.1

2 3

[alsa-devel] [PATCH v2] ASoC: cs4349: Add support for Cirrus Logic CS4349
by timothyc.howe＠gmail.com 15 Jul '15

15 Jul '15

From: Tim Howe <tim.howe(a)cirrus.com> Signed-off-by: Tim Howe <tim.howe(a)cirrus.com> --- sound/soc/codecs/cs4349.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index c9a96b6..ee6b676 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -305,19 +305,8 @@ static int cs4349_i2c_probe(struct i2c_client *client, return ret; } - if (pdata) { + if (pdata) cs4349->pdata = *pdata; - } else { - pdata = devm_kzalloc(&client->dev, - sizeof(struct cs4349_platform_data), - GFP_KERNEL); - if (!pdata) { - dev_err(&client->dev, - "could not allocate pdata\n"); - return -ENOMEM; - } - cs4349->pdata = *pdata; - } /* Reset the Device */ cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev, @@ -330,9 +319,6 @@ static int cs4349_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, cs4349); - dev_info(&client->dev, - "Cirrus Logic CS4349\n"); - return snd_soc_register_codec(&client->dev, &soc_codec_dev_cs4349, &cs4349_dai, 1); } @@ -357,14 +343,17 @@ static int cs4349_runtime_suspend(struct device *dev) struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev); int ret; - /* Hold down reset */ - if (cs4349->reset_gpio) - gpiod_set_value_cansleep(cs4349->reset_gpio, 0); - ret = snd_soc_update_bits(rtd->codec, CS4349_MISC, PWR_DWN, 1); if (ret < 0) return ret; + regcache_cache_only(cs4349->regmap, true); + regcache_sync(cs4349->regmap); + + /* Hold down reset */ + if (cs4349->reset_gpio) + gpiod_set_value_cansleep(cs4349->reset_gpio, 0); + return 0; } -- 2.4.5

2 1

[alsa-devel] [GIT PULL] Braswell firmware update
by Vinod Koul 14 Jul '15

14 Jul '15

Hello Linux firmware maintainers, Please PULL to receive the updated BSW firmware binary which contains power management fixes. We have also updated the version of binary in WHENCE file The following changes since commit 3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c: linux-firmware: Update firmware patch for Intel Bluetooth 7260 (B3/B4) (2015-05-13 11:12:48 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git BSW for you to fetch changes up to e5fa14afd09909124fc7618fc4a0ac00fa4f9347: linux-firmware: update audio firmware for Braswell platform (2015-06-17 11:21:47 +0530) ---------------------------------------------------------------- Vinod Koul (1): linux-firmware: update audio firmware for Braswell platform WHENCE | 1 + intel/fw_sst_22a8.bin | Bin 647390 -> 701614 bytes 2 files changed, 1 insertion(+) Thanks -- ~Vinod

2 2

[alsa-devel] [PATCH] cht_bsw_rt5645: Fix Kernel crash with strcpy
by Jenny TC 14 Jul '15

14 Jul '15

Kernel crash is observed when strcpy is used with const char*. The crash is reported only if driver is loaded as a module or the probe is called in the late stage of Kernel boot (EPROBE_DEFER). This is because Kernel enables read only protection near the end. Issue is addressed by replacing the strcpy with pointer assignment Signed-off-by: Jenny TC <jenny.tc(a)intel.com> --- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index bdcaf46..3665d6c 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -367,7 +367,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) card->dev = &pdev->dev; sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id); /* set correct codec name */ - strcpy((char *)card->dai_link[2].codec_name, codec_name); + card->dai_link[2].codec_name = codec_name; snd_soc_card_set_drvdata(card, drv); ret_val = devm_snd_soc_register_card(&pdev->dev, card); if (ret_val) { -- 1.7.9.5

1 0

[alsa-devel] [PATCH] ALSA: line6: Fix -EBUSY error during active monitoring
by Takashi Iwai 14 Jul '15

14 Jul '15

When a monitor stream is active, the next PCM stream access results in EBUSY error because of the check in line6_stream_start(). Fix this by just skipping the submission of pending URBs when the stream is already running instead. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=101431 Cc: <stable(a)vger.kernel.org> # v4.0+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/line6/pcm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 8461d6bf992f..204cc074adb9 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -186,12 +186,8 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction, int ret = 0; spin_lock_irqsave(&pstr->lock, flags); - if (!test_and_set_bit(type, &pstr->running)) { - if (pstr->active_urbs || pstr->unlink_urbs) { - ret = -EBUSY; - goto error; - } - + if (!test_and_set_bit(type, &pstr->running) && + !(pstr->active_urbs || pstr->unlink_urbs)) { pstr->count = 0; /* Submit all currently available URBs */ if (direction == SNDRV_PCM_STREAM_PLAYBACK) @@ -199,7 +195,6 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction, else ret = line6_submit_audio_in_all_urbs(line6pcm); } - error: if (ret < 0) clear_bit(type, &pstr->running); spin_unlock_irqrestore(&pstr->lock, flags); -- 2.4.5

1 0

[alsa-devel] ASoC Multiple outputs
by Matt Redfearn 14 Jul '15

14 Jul '15

Hi list, I am writing an ALSA driver for an SoC / board which has a single I2S source. The source may be connected internally to either a codec outputting to analogue headphones, or to an HDMI transmitter. At the moment I have set up two snd_soc_dai_link within the same card connecting the source to each sink. static struct snd_soc_dai_link ci20_dai_link[] = { { .name = "ci20", .stream_name = "headphones", .cpu_dai_name = "jz4780-i2s", .platform_name = "jz4780-i2s", .codec_dai_name = "jz4780-hifi", .codec_name = "jz4780-codec", .init = ci20_init, .ops = &ci20_audio_dai_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, }, { .name = "ci20 HDMI", .stream_name = "hdmi", .cpu_dai_name = "jz4780-i2s", .platform_name = "jz4780-i2s", .codec_dai_name = "dw-hdmi-hifi", .codec_name = "dw-hdmi-audio", .init = ci20_hdmi_init, .ops = &ci20_audio_dai_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, } }; This works and creates 2 devices, and I am able to get mplayer to play sound out to either the headphones or HDMI using the argument "-ao alsa:device=hw=0.0" or "-ao alsa:device=hw=0.1" aplay -l **** List of PLAYBACK Hardware Devices **** card 0: ci20 [ci20], device 0: headphones jz4780-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: ci20 [ci20], device 1: hdmi jz4780-hdmi-hifi-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 However, alsamixer does not show anything about the second device (HDMI), only the analogue output associated with device 0. Please could someone advise what is the "correct" way to set up multiple links in such a system such that the headphones / HDMI outputs appear in the mixer and are available to pulseaudio. Should I create multiple cards? Should I create subdevices for the different outputs? If so, what structures should be set up within the driver to achieve this? Suggestions of any documentation / websites that may help would be great! Thanks! Matt

2 1

[alsa-devel] [PATCH] ASoC: topology: Fix to add dapm mixer info
by Subhransu S. Prusty 14 Jul '15

14 Jul '15

From: Jeeja KP <jeeja.kp(a)intel.com> Mixer control for widgets can't be created if the info is NULL. So assign the correct info for this. Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Acked-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index f38f111..70bcfe9 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -144,7 +144,7 @@ static const struct snd_soc_tplg_kcontrol_ops io_ops[] = { {SND_SOC_TPLG_CTL_STROBE, snd_soc_get_strobe, snd_soc_put_strobe, NULL}, {SND_SOC_TPLG_DAPM_CTL_VOLSW, snd_soc_dapm_get_volsw, - snd_soc_dapm_put_volsw, NULL}, + snd_soc_dapm_put_volsw, snd_soc_info_volsw}, {SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE, snd_soc_dapm_get_enum_double, snd_soc_dapm_put_enum_double, snd_soc_info_enum_double}, {SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT, snd_soc_dapm_get_enum_double, -- 2.4.3

2 1

[alsa-devel] [PATCH] ASoC: max98925: Remove control_data initialization
by Lars-Peter Clausen 14 Jul '15

14 Jul '15

The control_data field of the snd_soc_codec struct is no longer used by ASoC drivers using standard regmap IO. There is no need to initialize the field to point to the drivers regmap struct, so drop that. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/codecs/max98925.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index aad6642..eddf8bc 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -523,7 +523,6 @@ static int max98925_probe(struct snd_soc_codec *codec) struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); max98925->codec = codec; - codec->control_data = max98925->regmap; regmap_write(max98925->regmap, MAX98925_GLOBAL_ENABLE, 0x00); /* It's not the default but we need to set DAI_DLY */ regmap_write(max98925->regmap, -- 2.1.4

2 1

[alsa-devel] [PATCH 1/3] ASoC: max98357a: Make 'sdmode-gpios' dts property optional
by Anatol Pomozov 14 Jul '15

14 Jul '15

The option is not needed if chip is always on or managed by some other part of system like platform card driver. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- Documentation/devicetree/bindings/sound/max98357a.txt | 6 +++++- sound/soc/codecs/max98357a.c | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt index a7a149a..28645a2 100644 --- a/Documentation/devicetree/bindings/sound/max98357a.txt +++ b/Documentation/devicetree/bindings/sound/max98357a.txt @@ -4,7 +4,11 @@ This node models the Maxim MAX98357A DAC. Required properties: - compatible : "maxim,max98357a" -- sdmode-gpios : GPIO specifier for the GPIO -> DAC SDMODE pin + +Optional properties: +- sdmode-gpios : GPIO specifier for the chip's SD_MODE pin. + If this option is not specified then driver does not manage + the pin state (e.g. chip is always on). Example: diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index 3a2fda0..fa1b793 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -31,6 +31,9 @@ static int max98357a_daiops_trigger(struct snd_pcm_substream *substream, { struct gpio_desc *sdmode = snd_soc_dai_get_drvdata(dai); + if (!sdmode) + return 0; + switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: @@ -60,7 +63,7 @@ static int max98357a_codec_probe(struct snd_soc_codec *codec) { struct gpio_desc *sdmode; - sdmode = devm_gpiod_get(codec->dev, "sdmode", GPIOD_OUT_LOW); + sdmode = devm_gpiod_get_optional(codec->dev, "sdmode", GPIOD_OUT_LOW); if (IS_ERR(sdmode)) { dev_err(codec->dev, "%s() unable to get sdmode GPIO: %ld\n", __func__, PTR_ERR(sdmode)); -- 2.4.5

3 6