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

[alsa-devel] [PATCH v3] ASoC: codec: hdac_hdmi: fix pin connections at cvt enable
by Kai Vehmanen 13 Jun '19

13 Jun '19

In display codecs supported by hdac_hdmi, the connection indices are shared by all converters. At boot and resume from suspend, the connection state may be reset to default values. In case of multiple connected pins (multiple monitors connected with audio capability), routing and mute status of pins that are not connected to any PCM, may interfere with other pins. E.g. after resume from S3 with multiple monitors, unless all converters are in active use, playback to some PCMs may be muted due to the default settings of unrelated converters. Avoid this by ensuring all pin:cvt selections are correct in codec whenever a converter is enabled for playback. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/codecs/hdac_hdmi.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 660e0587f3999..7eba57157bb94 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -546,6 +546,29 @@ static struct hdac_hdmi_port *hdac_hdmi_get_port_from_cvt( return NULL; } +/* + * Go through all converters and ensure connection is set to + * the correct pin as set via kcontrols. + */ +static void hdac_hdmi_verify_connect_sel_all_pins(struct hdac_device *hdev) +{ + struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev); + struct hdac_hdmi_port *port; + struct hdac_hdmi_cvt *cvt; + int cvt_idx = 0; + + list_for_each_entry(cvt, &hdmi->cvt_list, head) { + port = hdac_hdmi_get_port_from_cvt(hdev, hdmi, cvt); + if (port && port->pin) { + snd_hdac_codec_write(hdev, port->pin->nid, 0, + AC_VERB_SET_CONNECT_SEL, cvt_idx); + dev_dbg(&hdev->dev, "%s: %s set connect %d -> %d\n", + __func__, cvt->name, port->pin->nid, cvt_idx); + } + ++cvt_idx; + } +} + /* * This tries to get a valid pin and set the HW constraints based on the * ELD. Even if a valid pin is not found return success so that device open @@ -806,6 +829,14 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w, AC_VERB_SET_CHANNEL_STREAMID, pcm->stream_tag); snd_hdac_codec_write(hdev, cvt->nid, 0, AC_VERB_SET_STREAM_FORMAT, pcm->format); + + /* + * The connection indices are shared by all converters and + * may interfere with each other. Ensure correct + * routing for all converters at stream start. + */ + hdac_hdmi_verify_connect_sel_all_pins(hdev); + break; case SND_SOC_DAPM_POST_PMD: -- 2.17.1

3 3

[alsa-devel] [PATCH] ASoC: tas571x: Fix -Wunused-const-variable
by Nathan Huckleberry 13 Jun '19

13 Jun '19

Clang produces the following warning sound/soc/codecs/tas571x.c:666:38: warning: unused variable 'tas5721_controls' [-Wunused-const-variable] In the chip struct definition tas5711_controls is used rather than tac5712_controls. Looks like a typo was made in the original commit. Since tac5711_controls is identical to tas5721_controls we can just swap them Cc: clang-built-linux(a)googlegroups.com Link: https://github.com/ClangBuiltLinux/linux/issues/522 Signed-off-by: Nathan Huckleberry <nhuck(a)google.com> --- sound/soc/codecs/tas571x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c index 20798fa2988a..1554631cb397 100644 --- a/sound/soc/codecs/tas571x.c +++ b/sound/soc/codecs/tas571x.c @@ -721,8 +721,8 @@ static const struct regmap_config tas5721_regmap_config = { static const struct tas571x_chip tas5721_chip = { .supply_names = tas5721_supply_names, .num_supply_names = ARRAY_SIZE(tas5721_supply_names), - .controls = tas5711_controls, - .num_controls = ARRAY_SIZE(tas5711_controls), + .controls = tas5721_controls, + .num_controls = ARRAY_SIZE(tas5721_controls), .regmap_config = &tas5721_regmap_config, .vol_reg_size = 1, }; -- 2.22.0.rc2.383.gf4fbbf30c2-goog

3 2

[alsa-devel] [PATCH 0/5] ASoC: SOF: IPC: style, logs and suspend improvements
by Pierre-Louis Bossart 13 Jun '19

13 Jun '19

4 mostly cosmetic patches and a nice one to force recovery on failed suspend Dragos Tarcatu (1): ASOC: SOF: ipc: prevent logging trace messages Kai Vehmanen (2): ASoC: SOF: intel: extend IPC dump information ASoC: SOF: ignore unrecoverable CTX_SAVE IPC errors at suspend Pierre-Louis Bossart (2): ASoC: SOF: uapi: align comments with firmware files ASoC: SOF: ipc: clarify operator precedence include/sound/sof/topology.h | 4 ++-- include/sound/sof/trace.h | 4 +++- sound/soc/sof/intel/cnl.c | 2 ++ sound/soc/sof/intel/hda.c | 29 +++++++++++++++++++++++++++++ sound/soc/sof/intel/hda.h | 2 ++ sound/soc/sof/ipc.c | 9 +++++---- sound/soc/sof/pm.c | 11 ++++++++++- 7 files changed, 53 insertions(+), 8 deletions(-) -- 2.20.1

2 10

[alsa-devel] [PATCH] ASoC: soc-topology: fix modern dai link style
by Pierre-Louis Bossart 13 Jun '19

13 Jun '19

The topology code can create a FE DAI link but did not allocate the memory for a platform component - whose name can be overridden at a later time. Fixes: 23b946ce2808b ("ASoC: soc-topology: use modern dai_link style") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/soc-topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index f485f7f751a1..b538412e4bcf 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1882,8 +1882,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, struct snd_soc_dai_link_component *dlc; int ret; - /* link + cpu + codec */ - link = kzalloc(sizeof(*link) + (2 * sizeof(*dlc)), GFP_KERNEL); + /* link + cpu + codec + platform */ + link = kzalloc(sizeof(*link) + (3 * sizeof(*dlc)), GFP_KERNEL); if (link == NULL) return -ENOMEM; @@ -1891,9 +1891,11 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, link->cpus = &dlc[0]; link->codecs = &dlc[1]; + link->platforms = &dlc[2]; link->num_cpus = 1; link->num_codecs = 1; + link->num_platforms = 1; if (strlen(pcm->pcm_name)) { link->name = kstrdup(pcm->pcm_name, GFP_KERNEL); @@ -1907,6 +1909,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, link->codecs->name = "snd-soc-dummy"; link->codecs->dai_name = "snd-soc-dummy-dai"; + link->platforms->name = "snd-soc-dummy"; + /* enable DPCM */ link->dynamic = 1; link->dpcm_playback = le32_to_cpu(pcm->playback); -- 2.20.1

2 1

[alsa-devel] [PATCH 0/4] ASoC: SOF: control/topology improvements
by Pierre-Louis Bossart 13 Jun '19

13 Jun '19

3 patches to improve volume handling and DMIC unmute, plus a long-overdue one to avoid waking-up the DSP when reading from a kcontrol cached value. Bard Liao (1): ASoC: SOF: dont wake dsp up in kcontrol IO Seppo Ingalsuo (1): ASoC: SOF: Add DMIC token for unmute gain ramp time Zhu Yingjiang (2): ASoC: SOF: topology: add min/max step for volume_table ASoC: SOF: topology: pass volume min/max linear value to FW include/sound/sof/dai-intel.h | 3 +- include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 1 + sound/soc/sof/control.c | 270 +++++--------------------------- sound/soc/sof/sof-priv.h | 2 + sound/soc/sof/topology.c | 68 ++++++++ 6 files changed, 112 insertions(+), 234 deletions(-) -- 2.20.1

2 8

[alsa-devel] [PATCH] ALSA: pci: echoaudio: remove variable which is a constant
by Wolfram Sang 13 Jun '19

13 Jun '19

Checking a variable which is always '1' has no use. Signed-off-by: Wolfram Sang <wsa(a)the-dreams.de> --- Only build tested. Found by static code analysis of similar patterns. sound/pci/echoaudio/echoaudio_dsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c index b181752b8481..50d4a87a6bb3 100644 --- a/sound/pci/echoaudio/echoaudio_dsp.c +++ b/sound/pci/echoaudio/echoaudio_dsp.c @@ -1058,7 +1058,6 @@ static int allocate_pipes(struct echoaudio *chip, struct audiopipe *pipe, { int i; u32 channel_mask; - char is_cyclic; dev_dbg(chip->card->dev, "allocate_pipes: ch=%d int=%d\n", pipe_index, interleave); @@ -1066,8 +1065,6 @@ static int allocate_pipes(struct echoaudio *chip, struct audiopipe *pipe, if (chip->bad_board) return -EIO; - is_cyclic = 1; /* This driver uses cyclic buffers only */ - for (channel_mask = i = 0; i < interleave; i++) channel_mask |= 1 << (pipe_index + i); if (chip->pipe_alloc_mask & channel_mask) { @@ -1078,8 +1075,8 @@ static int allocate_pipes(struct echoaudio *chip, struct audiopipe *pipe, chip->comm_page->position[pipe_index] = 0; chip->pipe_alloc_mask |= channel_mask; - if (is_cyclic) - chip->pipe_cyclic_mask |= channel_mask; + /* This driver uses cyclic buffers only */ + chip->pipe_cyclic_mask |= channel_mask; pipe->index = pipe_index; pipe->interleave = interleave; pipe->state = PIPE_STATE_STOPPED; -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: bxt-da7219-max98357a: add BE dailink for dmic16k
by Pierre-Louis Bossart 13 Jun '19

13 Jun '19

From: Keyon Jie <yang.jie(a)linux.intel.com> We need dmic16k BE(and FE, in tplg file) dailink for keyword detection feature on bxt-da7219-max98357a machine, here add it in driver side. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index ab867252af20..c0d865a940dc 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -404,6 +404,10 @@ SND_SOC_DAILINK_DEF(ssp1_codec, SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin"))); + +SND_SOC_DAILINK_DEF(dmic16k_pin, + DAILINK_COMP_ARRAY(COMP_CPU("DMIC16k Pin"))); + SND_SOC_DAILINK_DEF(dmic_codec, DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi"))); @@ -578,6 +582,14 @@ static struct snd_soc_dai_link broxton_dais[] = { .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, + { + .name = "dmic16k", + .id = 6, + .be_hw_params_fixup = broxton_dmic_fixup, + .dpcm_capture = 1, + .no_pcm = 1, + SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), + }, }; #define NAME_SIZE 32 -- 2.20.1

2 1

[alsa-devel] [GIT PULL] ASoC fixes for v5.2
by Mark Brown 13 Jun '19

13 Jun '19

The following changes since commit 7f6647ced298d56027218e47619b7f0d925fc83e: ASoC: SOF: Fix unused variable warnings (2019-05-09 11:18:57 +0900) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.2-rc4 for you to fetch changes up to 3da428ff2aa5a5191ba2f1630eea75f03242f3f2: ASoC: Intel: sst: fix kmalloc call with wrong flags (2019-06-10 15:37:17 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.2 There's an awful lot of fixes here, almost all for the newly introduced SoF DSP drivers (including a few things it turned up in shared code). This is a large and complex piece of code so it's not surprising that there have been quite a few issues here, fortunately things seem to have mostly calmed down now. Otherwise there's just a smattering of small fixes. ---------------------------------------------------------------- Alex Levin (1): ASoC: Intel: sst: fix kmalloc call with wrong flags Amadeusz Sławiński (2): ALSA: hdac: fix memory release for SST and SOF drivers SoC: rt274: Fix internal jack assignment in set_jack callback Curtis Malainey (1): ASoC: rt5677-spi: Handle over reading when flipping bytes Georgii Staroselskii (1): ASoC: sun4i-codec: fix first delay on Speaker Guennadi Liakhovetski (1): ASoC: SOF: ipc: fix a race, leading to IPC timeouts Jon Hunter (2): ASoC: simple-card: Fix configuration of DAI format ASoC: simple-card: Restore original configuration of DAI format Kai Vehmanen (2): ASoC: SOF: fix race in FW boot timeout handling ASoC: SOF: fix DSP oops definitions in FW ABI Keyon Jie (1): ASoC: SOF: control: correct the copy size for bytes kcontrol put Kovács Tamás (1): ASoC: Intel: Baytrail: add quirk for Aegex 10 (RU2) tablet Kuninori Morimoto (2): ASoC: soc-dpm: fixup DAI active unbalance ASoC: soc-core: fixup references at soc_cleanup_card_resources() Libin Yang (2): ASoC: soc-pcm: BE dai needs prepare when pause release after resume ASoC: SOF: pcm: clear hw_params_upon_resume flag correctly Marcus Cooper (2): ASoC: sun4i-i2s: Fix sun8i tx channel offset mask ASoC: sun4i-i2s: Add offset to RX channel select Matt Flax (1): ASoC : cs4265 : readable register too low Pan Xiuli (1): ASoC: SOF: soundwire: add initial soundwire support Pierre-Louis Bossart (9): ASoC: SOF: nocodec: fix undefined reference ASoC: SOF: core: fix error handling with the probe workqueue ASoC: SOF: pcm: remove warning - initialize workqueue on open ASoC: SOF: uapi: mirror firmware changes ASoC: SOF: bump to ABI 3.6 ASoC: Intel: cht_bsw_max98090: fix kernel oops with platform_name override ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override ASoC: Intel: cht_bsw_nau8824: fix kernel oops with platform_name override ASoC: Intel: cht_bsw_rt5672: fix kernel oops with platform_name override Ranjani Sridharan (6): ASoC: SOF: fix error in verbose ipc command parsing ASoC: core: lock client_mutex while removing link components ASoC: SOF: core: remove DSP after unregistering machine driver ASoC: SOF: core: remove snd_soc_unregister_component in case of error ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC ASoC: core: Fix deadlock in snd_soc_instantiate_card() S.j. Wang (2): ASoC: fsl_asrc: Fix the issue about unsupported rate ASoC: cs42xx8: Add regcache mask dirty Sathya Prakash M R (3): ASoC: Intel: soc-acpi: Fix machine selection order ASoC: Intel: sof-rt5682: fix for codec button mapping ASoC: Intel: sof-rt5682: fix AMP quirk support Slawomir Blauciak (1): ASoC: SOF: ipc: replace fw ready bitfield with explicit bit ordering Tzung-Bi Shih (1): ASoC: core: move DAI pre-links initiation to snd_soc_instantiate_card Viorel Suman (2): ASoC: ak4458: add return value for ak4458_probe ASoC: ak4458: rstn_control - return a non-zero on error only Yu-Hsuan Hsu (1): ASoC: max98090: remove 24-bit format support if RJ is 0 YueHaibing (2): ASoC: SOF: Intel: hda: Fix COMPILE_TEST build error ASoC: da7219: Fix build error without CONFIG_I2C Zhu Yingjiang (2): ASoC: SOF: Intel: hda: fix the hda init chip ASoC: SOF: Intel: hda: use the defined ppcap functions include/sound/sof/dai.h | 1 + include/sound/sof/header.h | 23 ++++ include/sound/sof/info.h | 20 ++-- include/sound/sof/xtensa.h | 9 +- include/uapi/sound/sof/abi.h | 2 +- sound/hda/ext/hdac_ext_bus.c | 1 - sound/pci/hda/hda_codec.c | 9 +- sound/soc/codecs/ak4458.c | 18 +-- sound/soc/codecs/cs4265.c | 2 +- sound/soc/codecs/cs42xx8.c | 1 + sound/soc/codecs/max98090.c | 16 +++ sound/soc/codecs/rt274.c | 3 +- sound/soc/codecs/rt5670.c | 12 ++ sound/soc/codecs/rt5677-spi.c | 5 +- sound/soc/fsl/fsl_asrc.c | 4 +- sound/soc/intel/atom/sst/sst_pvt.c | 4 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/sof_rt5682.c | 11 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 17 +++ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 10 +- sound/soc/mediatek/Kconfig | 2 +- sound/soc/soc-core.c | 36 +++--- sound/soc/soc-dapm.c | 7 +- sound/soc/soc-pcm.c | 3 +- sound/soc/sof/Kconfig | 8 +- sound/soc/sof/control.c | 9 +- sound/soc/sof/core.c | 29 ++++- sound/soc/sof/intel/bdw.c | 26 +++-- sound/soc/sof/intel/byt.c | 25 +++-- sound/soc/sof/intel/cnl.c | 4 + sound/soc/sof/intel/hda-ctrl.c | 102 +++++++++++++++-- sound/soc/sof/intel/hda-ipc.c | 17 ++- sound/soc/sof/intel/hda.c | 129 ++++++---------------- sound/soc/sof/ipc.c | 26 ++--- sound/soc/sof/loader.c | 2 + sound/soc/sof/pcm.c | 8 +- sound/soc/sof/xtensa/core.c | 2 +- sound/soc/sunxi/sun4i-codec.c | 9 ++ sound/soc/sunxi/sun4i-i2s.c | 6 +- 42 files changed, 398 insertions(+), 228 deletions(-)

2 1

Re: [alsa-devel] [PATCH 0/3] ASoC: SOF: fix suspend ordering with runtime idle
by Pierre-Louis Bossart 13 Jun '19

13 Jun '19

[Cc: Takashi] On 6/12/19 4:44 AM, Kai Vehmanen wrote: > Hi all, > this series addresses issues with ordering of HDA codec and controller > suspends in the runtime PM flows. The implemented logic for SOF is > similar to what has been used by the Intel AZX HDA driver. > > To implement this, first a fix is needed to hdac_hdmic ASoC codec > driver. SOF framework also needs to be extended to allow SOF devices > to implement a runtime_idle callback. Third, concrete implementation > is in a separate patch for APL/CNL Intel hardware, for which strict > ordering of codec-controller power down sequence needs to be > maintained. Looks good to me Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> but of course we'd want feedback from Takashi and other folks more familiar with the HDaudio history. There will be additional patches in the coming days where we are catching up with issues that were fixed in the legacy driver but either missed or not known to the SOF developers. > > As this extends the SOF device interface, Pierre asked me to > send to the list for wider review. This series has been prereviewd > at SOF github as: > https://github.com/thesofproject/linux/pull/1003 Indeed we want the SOF core changes and dependencies (topology and hdaudio typically) to be reviewed on the alsa-devel mailing list. For Intel-specific fixes we still want to use GitHub and provide patches when we've hit a decent level of validation on prototype and production hardware, otherwise we'll increase the traffic on this list for no good reason. > Kai Vehmanen (3): > ASoC: hdac_hdmi: report codec link up/down status to bus > ASoC: SOF: add runtime idle callback > ASoC: SOF: Intel: implement runtime idle for CNL/APL > > sound/soc/codecs/hdac_hdmi.c | 2 ++ > sound/soc/sof/intel/apl.c | 1 + > sound/soc/sof/intel/cnl.c | 1 + > sound/soc/sof/intel/hda-dsp.c | 13 +++++++++++++ > sound/soc/sof/intel/hda.h | 1 + > sound/soc/sof/pm.c | 8 ++++++++ > sound/soc/sof/sof-acpi-dev.c | 2 +- > sound/soc/sof/sof-pci-dev.c | 2 +- > sound/soc/sof/sof-priv.h | 2 ++ > 9 files changed, 30 insertions(+), 2 deletions(-) >

3 2

[alsa-devel] [PATCH] ALSA: hda/hdmi - consider eld_valid also in sync_eld_via_acomp()
by Jaroslav Kysela 13 Jun '19

13 Jun '19

In the commit 7f641e26a6df9269cb25dd7a4b0a91d6586ed441 (ALSA: hda/hdmi - Consider eld_valid when reporting jack event) the eld_valid check was added for the jack event reports. Do the same in sync_eld_via_acomp() function. Apparently, it is required for the NVIDIA proprietary driver (monitor presence reported first, but ELD is available later). Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/pci/hda/patch_hdmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 0c61c05503f5..b522314ec5be 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1627,7 +1627,8 @@ static void sync_eld_via_acomp(struct hda_codec *codec, if (jack == NULL) goto unlock; snd_jack_report(jack, - eld->monitor_present ? SND_JACK_AVOUT : 0); + (eld->monitor_present && eld->eld_valid) ? + SND_JACK_AVOUT : 0); unlock: mutex_unlock(&per_pin->lock); } -- 2.20.1

2 1