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

[alsa-devel] [PATCH] ALSA: seq: Fix OOB-reads from strlcpy
by Zubin Mithra 05 Apr '19

05 Apr '19

When ioctl calls are made with non-null-terminated userspace strings, strlcpy causes an OOB-read from within strlen. Fix by changing to use strscpy instead. Signed-off-by: Zubin Mithra <zsm(a)chromium.org> --- sound/core/seq/seq_clientmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 7d4640d1fe9fb..38e7deab63847 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -1252,7 +1252,7 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client, /* fill the info fields */ if (client_info->name[0]) - strlcpy(client->name, client_info->name, sizeof(client->name)); + strscpy(client->name, client_info->name, sizeof(client->name)); client->filter = client_info->filter; client->event_lost = client_info->event_lost; @@ -1530,7 +1530,7 @@ static int snd_seq_ioctl_create_queue(struct snd_seq_client *client, void *arg) /* set queue name */ if (!info->name[0]) snprintf(info->name, sizeof(info->name), "Queue-%d", q->queue); - strlcpy(q->name, info->name, sizeof(q->name)); + strscpy(q->name, info->name, sizeof(q->name)); snd_use_lock_free(&q->use_lock); return 0; @@ -1592,7 +1592,7 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client, queuefree(q); return -EPERM; } - strlcpy(q->name, info->name, sizeof(q->name)); + strscpy(q->name, info->name, sizeof(q->name)); queuefree(q); return 0; -- 2.21.0.392.gf8f6787159e-goog

3 2

[alsa-devel] [PATCH 1/3] ASoC: wcd9335: fix a leaked reference by adding missing of_node_put
by Wen Yang 05 Apr '19

05 Apr '19

The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: ./sound/soc/codecs/wcd9335.c:5193:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 5183, but without a correspon ding object release within this function. Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Vinod Koul <vkoul(a)kernel.org> Cc: Dan Carpenter <dan.carpenter(a)oracle.com> (commit_signer:1/11=9%,authored:1/11=9%) Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org --- sound/soc/codecs/wcd9335.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 981f88a..a04a7ce 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -5188,6 +5188,7 @@ static int wcd9335_slim_status(struct slim_device *sdev, wcd->slim = sdev; wcd->slim_ifc_dev = of_slim_get_device(sdev->ctrl, ifc_dev_np); + of_node_put(ifc_dev_np); if (!wcd->slim_ifc_dev) { dev_err(dev, "Unable to get SLIM Interface device\n"); return -EINVAL; -- 2.9.5

2 3

[alsa-devel] [PATCH V3] ASoC: fsl_esai: Support synchronous mode
by S.j. Wang 05 Apr '19

05 Apr '19

In ESAI synchronous mode, the clock is generated by Tx, So we should always set registers of Tx which relate with the bit clock and frame clock generation (TCCR, TCR, ECR), even there is only Rx is working. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- Changes in v3 - fix the indentation sound/soc/fsl/fsl_esai.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 3623aa9a6f2e..c7410bbfd2af 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -218,7 +218,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, { struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); struct clk *clksrc = esai_priv->extalclk; - bool tx = clk_id <= ESAI_HCKT_EXTAL; + bool tx = (clk_id <= ESAI_HCKT_EXTAL || esai_priv->synchronous); bool in = dir == SND_SOC_CLOCK_IN; u32 ratio, ecr = 0; unsigned long clk_rate; @@ -253,7 +253,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, ecr |= ESAI_ECR_ETI; /* fall through */ case ESAI_HCKR_EXTAL: - ecr |= ESAI_ECR_ERI; + ecr |= esai_priv->synchronous ? ESAI_ECR_ETI : ESAI_ECR_ERI; break; default: return -EINVAL; @@ -537,10 +537,18 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream, bclk = params_rate(params) * slot_width * esai_priv->slots; - ret = fsl_esai_set_bclk(dai, tx, bclk); + ret = fsl_esai_set_bclk(dai, esai_priv->synchronous || tx, bclk); if (ret) return ret; + mask = ESAI_xCR_xSWS_MASK; + val = ESAI_xCR_xSWS(slot_width, width); + + regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), mask, val); + /* Recording in synchronous mode needs to set TCR also */ + if (!tx && esai_priv->synchronous) + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, val); + /* Use Normal mode to support monaural audio */ regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), ESAI_xCR_xMOD_MASK, params_channels(params) > 1 ? @@ -556,10 +564,9 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(esai_priv->regmap, REG_ESAI_xFCR(tx), mask, val); - mask = ESAI_xCR_xSWS_MASK | (tx ? ESAI_xCR_PADC : 0); - val = ESAI_xCR_xSWS(slot_width, width) | (tx ? ESAI_xCR_PADC : 0); - - regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), mask, val); + if (tx) + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, + ESAI_xCR_PADC, ESAI_xCR_PADC); /* Remove ESAI personal reset by configuring ESAI_PCRC and ESAI_PRRC */ regmap_update_bits(esai_priv->regmap, REG_ESAI_PRRC, -- 1.9.1

2 1

[alsa-devel] [PATCH 0/7] ASoC: cs42l51: add some features
by Olivier Moysan 05 Apr '19

05 Apr '19

This patchset add support of following features to Cirrus CS42L51 audio codec driver: - reset - regulators - master mode - power management - adc volume control Olivier Moysan (7): ASoC: dt-bindings: update cs42l51 bindings ASoC: cs42l51: add regulator management ASoC: cs42l51: add reset management ASoC: cs42l51: add support of master mode ASoC: cs42l51: change mic bias DAPM ASoC: cs42l51: add power management ASoC: cs42l51: add adc volume control .../devicetree/bindings/sound/cs42l51.txt | 16 ++ sound/soc/codecs/cs42l51-i2c.c | 13 +- sound/soc/codecs/cs42l51.c | 217 ++++++++++++++++++++- sound/soc/codecs/cs42l51.h | 3 + 4 files changed, 242 insertions(+), 7 deletions(-) -- 2.7.4

2 16

[alsa-devel] [PATCH] ASoC: cs35l35: Disable regulators on driver removal
by Charles Keepax 05 Apr '19

05 Apr '19

The chips main power supplies VA and VP are enabled during probe but then never disabled, this will cause warnings from the regulator framework on driver removal. Fix this by adding a remove callback and disabling the supplies, whilst doing so follow best practice and put the chip back into reset as well. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/cs35l35.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c index 9f4a59871cee7..c71696146c5ec 100644 --- a/sound/soc/codecs/cs35l35.c +++ b/sound/soc/codecs/cs35l35.c @@ -1635,6 +1635,16 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client, return ret; } +static int cs35l35_i2c_remove(struct i2c_client *i2c_client) +{ + struct cs35l35_private *cs35l35 = i2c_get_clientdata(i2c_client); + + regulator_bulk_disable(cs35l35->num_supplies, cs35l35->supplies); + gpiod_set_value_cansleep(cs35l35->reset_gpio, 0); + + return 0; +} + static const struct of_device_id cs35l35_of_match[] = { {.compatible = "cirrus,cs35l35"}, {}, @@ -1655,6 +1665,7 @@ static struct i2c_driver cs35l35_i2c_driver = { }, .id_table = cs35l35_id, .probe = cs35l35_i2c_probe, + .remove = cs35l35_i2c_remove, }; module_i2c_driver(cs35l35_i2c_driver); -- 2.11.0

2 1

[alsa-devel] [RFC PATCH 0/3] Fixes for component unregister and remove
by Ranjani Sridharan 05 Apr '19

05 Apr '19

This set of patches aims to fix the problems seen during module unloading with the skylake driver and also with SOF. The sequence seen during snd_soc_skl module unload is that the machine driver in unregistered first which frees the snd_card. When the component driver is unregistered following this and the topology is unloaded, a null pointer dereference is encountered while removing the kcontrols because the snd_card has already been freed. The first 2 patches fix this by removing the topology unloading from component_unregister() and moving it to the component remove() callback. This also makes the register_component() and unregister_component() calls balanced. But this still doesnt solve the problem entirely because the component driver's remove() callback is invoked after soc_cleanup_card_resources() which frees the snd_card. And we encounter the same null pointer dereference seen while remving the kcontrols added to the snd_card. In order to avoid this problem, the third patch proposes to remove the link components in snd_soc_unbind_card() before soc_cleanup_card_resources(). This way, the snd_card() will remain valid when the topology is unloaded. Ranjani Sridharan (3): ASoC: core: do not unload topology in unregister_component() ASoC: intel: skylake: add remove() callback for component driver ASoC: core: remove link components before cleaning up card resources sound/soc/intel/skylake/skl-pcm.c | 7 +++++++ sound/soc/soc-core.c | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) -- 2.17.1

2 10

[alsa-devel] [PATCH 0/6] ASoC: meson: add g12a SoC family support
by Jerome Brunet 05 Apr '19

05 Apr '19

The Amlogic g12a SoC family audio subsystem derives from the one found in the axg SoC family. To add support for the g12a in the existing elements, this patchset deals with following differences compared to the axg family: * fifos must set an initial start address within the buffer. The fifo pointer shall be reset to this address on startup. * frddrs may now play on up to 3 output interfaces simultaneously. * tdmout formatters need a different signal skew offset. Jerome Brunet (6): ASoC: meson: add g12a compatibles ASoC: meson: axg-fifo: add g12a support ASoC: meson: axg-toddr: add g12a support ASoC: meson: axg-frddr: add g12a support ASoC: meson: axg-tdm-formatter: rework quirks settings ASoC: meson: axg-tdmout: add g12a support .../bindings/sound/amlogic,axg-fifo.txt | 4 +- .../bindings/sound/amlogic,axg-pdm.txt | 3 +- .../bindings/sound/amlogic,axg-spdifin.txt | 3 +- .../bindings/sound/amlogic,axg-spdifout.txt | 3 +- .../sound/amlogic,axg-tdm-formatters.txt | 4 +- sound/soc/meson/axg-fifo.c | 34 ++++- sound/soc/meson/axg-fifo.h | 2 + sound/soc/meson/axg-frddr.c | 143 +++++++++++++++++- sound/soc/meson/axg-tdm-formatter.c | 6 +- sound/soc/meson/axg-tdm-formatter.h | 11 +- sound/soc/meson/axg-tdmin.c | 16 +- sound/soc/meson/axg-tdmout.c | 29 +++- sound/soc/meson/axg-toddr.c | 53 +++++++ 13 files changed, 286 insertions(+), 25 deletions(-) -- 2.20.1

2 12

[alsa-devel] [PATCH 0/2] ASoC: topology: fix endianness issues
by Pierre-Louis Bossart 05 Apr '19

05 Apr '19

Sparse reports dozens of issues with the topology code due to endianness. Fix as needed. There are still a handful of issues that I could not figure out (see below), but at least now the logs become usable. The only remaining problematic files are the SST loader and Skylake topology handling, which are likely to remain as is without any updates. sound/soc/soc-ops.c:657:33: warning: invalid assignment: &= sound/soc/soc-ops.c:657:33: left side has type unsigned short sound/soc/soc-ops.c:657:33: right side has type restricted __be16 sound/soc/soc-ops.c:661:33: warning: invalid assignment: &= sound/soc/soc-ops.c:661:33: left side has type unsigned int sound/soc/soc-ops.c:661:33: right side has type restricted __be32 sound/soc/soc-topology.c:616:70: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:618:70: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:633:60: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:635:60: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:637:61: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:650:60: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:652:60: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:654:61: warning: restricted __le32 degrades to integer sound/soc/soc-topology.c:2507:16: warning: restricted __le32 degrades to integer Pierre-Louis Bossart (2): ASoC: topology: fix endianness issues ASoC: topology: fix big-endian check sound/soc/soc-topology.c | 295 +++++++++++++++++++++++---------------- 1 file changed, 173 insertions(+), 122 deletions(-) -- 2.17.1

2 4

[alsa-devel] [PATCH 0/3] soundwire: code cleanup
by Pierre-Louis Bossart 04 Apr '19

04 Apr '19

SoundWire support will be provided in Linux with the Sound Open Firmware (SOF) on Intel platforms. Before we start adding the missing pieces, there are a number of warnings and style issues reported by checkpatch, cppcheck and Coccinelle that need to be cleaned-up. While I am at it, I could use feedback from maintainers. We are ready to release a number of required patches that were not provided earlier, but the initial contributors have either left Intel or moved on to other domains. While I'd like to give them credit for their work, I don't think leaving the email addresses as is is a good solution (email bounces, etc). I also don't think providing a non-Intel address is correct since the work was funded by Intel. Is there a recommended practice here? Pierre-Louis Bossart (3): soundwire: fix style issues soundwire: bus: remove useless initializations soundwire: stream: remove useless initialization of local variable drivers/soundwire/Kconfig | 2 +- drivers/soundwire/bus.c | 89 ++++++++-------- drivers/soundwire/bus.h | 16 +-- drivers/soundwire/bus_type.c | 4 +- drivers/soundwire/cadence_master.c | 87 +++++++-------- drivers/soundwire/cadence_master.h | 22 ++-- drivers/soundwire/intel.c | 89 ++++++++-------- drivers/soundwire/intel.h | 4 +- drivers/soundwire/intel_init.c | 12 +-- drivers/soundwire/mipi_disco.c | 116 +++++++++++--------- drivers/soundwire/slave.c | 10 +- drivers/soundwire/stream.c | 163 +++++++++++++++-------------- 12 files changed, 315 insertions(+), 299 deletions(-) -- 2.17.1

2 5

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

04 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 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) 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 HSW/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/intel/boards/haswell.c | 4 + sound/soc/sof/Kconfig | 141 +++++ sound/soc/sof/Makefile | 18 + sound/soc/sof/intel/Kconfig | 222 ++++++++ sound/soc/sof/intel/Makefile | 15 + sound/soc/sof/intel/apl.c | 112 ++++ sound/soc/sof/intel/bdw.c | 694 ++++++++++++++++++++++ sound/soc/sof/intel/byt.c | 853 ++++++++++++++++++++++++++++ sound/soc/sof/intel/cnl.c | 257 +++++++++ sound/soc/sof/intel/hda-bus.c | 108 ++++ sound/soc/sof/intel/hda-codec.c | 171 ++++++ sound/soc/sof/intel/hda-ctrl.c | 165 ++++++ sound/soc/sof/intel/hda-dai.c | 318 +++++++++++ sound/soc/sof/intel/hda-dsp.c | 428 ++++++++++++++ sound/soc/sof/intel/hda-ipc.c | 402 +++++++++++++ sound/soc/sof/intel/hda-loader.c | 366 ++++++++++++ sound/soc/sof/intel/hda-pcm.c | 242 ++++++++ sound/soc/sof/intel/hda-stream.c | 682 ++++++++++++++++++++++ sound/soc/sof/intel/hda-trace.c | 98 ++++ sound/soc/sof/intel/hda.c | 672 ++++++++++++++++++++++ sound/soc/sof/intel/hda.h | 546 ++++++++++++++++++ sound/soc/sof/intel/shim.h | 179 ++++++ sound/soc/sof/sof-acpi-dev.c | 310 ++++++++++ sound/soc/sof/sof-pci-dev.c | 373 ++++++++++++ 30 files changed, 7407 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/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

5 34