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

[alsa-devel] [PATCH] SoC: rockchip: disable clock on error
by Stefan Potyra 06 Dec '17

06 Dec '17

Disable the clocks in rk_spdif_probe when an error occurs after one of the clocks has been enabled previously. Found by Linux Driver Verification project (linuxtesting.org). Fixes: f874b80e1571 ASoC: rockchip: Add rockchip SPDIF transceiver driver Signed-off-by: Stefan Potyra <Stefan.Potyra(a)elektrobit.com> --- sound/soc/rockchip/rockchip_spdif.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index ee5055d47d13..a89fe9b6463b 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -322,26 +322,30 @@ static int rk_spdif_probe(struct platform_device *pdev) spdif->mclk = devm_clk_get(&pdev->dev, "mclk"); if (IS_ERR(spdif->mclk)) { dev_err(&pdev->dev, "Can't retrieve rk_spdif master clock\n"); - return PTR_ERR(spdif->mclk); + ret = PTR_ERR(spdif->mclk); + goto err_disable_hclk; } ret = clk_prepare_enable(spdif->mclk); if (ret) { dev_err(spdif->dev, "clock enable failed %d\n", ret); - return ret; + goto err_disable_clocks; } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(regs)) - return PTR_ERR(regs); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); + goto err_disable_clocks; + } spdif->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "hclk", regs, &rk_spdif_regmap_config); if (IS_ERR(spdif->regmap)) { dev_err(&pdev->dev, "Failed to initialise managed register map\n"); - return PTR_ERR(spdif->regmap); + ret = PTR_ERR(spdif->regmap); + goto err_disable_clocks; } spdif->playback_dma_data.addr = res->start + SPDIF_SMPDR; @@ -373,6 +377,10 @@ static int rk_spdif_probe(struct platform_device *pdev) err_pm_runtime: pm_runtime_disable(&pdev->dev); +err_disable_clocks: + clk_disable_unprepare(spdif->mclk); +err_disable_hclk: + clk_disable_unprepare(spdif->hclk); return ret; } -- 2.15.1

1 0

[alsa-devel] [PATCH v4 00/15] soundwire: Add a new SoundWire subsystem
by Vinod Koul 06 Dec '17

06 Dec '17

This patch series adds a new SoundWire subsystem which implements a new MIPI bus protocol 'SoundWire'. The SoundWire protocol is a robust, scalable, low complexity, low power, low latency, two-pin (clock and data) multi-drop bus that allows for the transfer of multiple audio streams and embedded control/commands. SoundWire provides synchronization capabilities and supports both PCM and PDM, multichannel data, isochronous and asynchronous modes. This series adds SoundWire Bus, IO transfers, DisCo (Discovery and Configuration) sysfs interface, regmap and Documentation summary This patch series is also available on git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git topic/patch_v4 v3: https://lkml.org/lkml/2017/11/30/160 v2: https://lkml.org/lkml/2017/11/10/216 v1: https://lkml.org/lkml/2017/10/18/1030 RFC: https://lkml.org/lkml/2016/10/21/395 Changes in v4: - Remove text licenses and add SPDX tags only with C99 style comments - make bus_type code as GPL v2.0 only Changes in v3: - Update the kernel-doc styles and fix included headers for files - handle dev_pm_domain_attach() for defered probe - remove OF placeholders - change regmap license to GPLv2 only Changes in v2: - move documentation into driver-api and do rst conversion - fix documentation comments - add SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) to all source files - rework the transfer logic and paging logic as commented on v1 - remove dummy sysfs fns - registration checks and fixes - remove slave check for regamp as that turned superfluous - remove depends SoundWire symbol - make modalias api arg const - use bitmap for tracking assigned - add counter for report present tracking todo: add the dt-bindings Sanyog Kale (4): Documentation: Add SoundWire summary soundwire: Add SoundWire MIPI defined registers soundwire: Add Slave status handling helpers soundwire: cdns: Add sdw_master_ops and IO transfer support Vinod Koul (11): soundwire: Add SoundWire bus type soundwire: Add Master registration soundwire: Add MIPI DisCo property helpers soundwire: Add IO transfer regmap: Add SoundWire bus support soundwire: Add slave status handling soundwire: Add sysfs for SoundWire DisCo properties soundwire: cdns: Add cadence library soundwire: intel: Add Intel Master driver soundwire: intel: Add Intel init module MAINTAINERS: Add SoundWire entry Documentation/driver-api/index.rst | 1 + Documentation/driver-api/soundwire/index.rst | 15 + Documentation/driver-api/soundwire/summary.rst | 205 ++++++ MAINTAINERS | 10 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/base/regmap/Kconfig | 4 + drivers/base/regmap/Makefile | 1 + drivers/base/regmap/regmap-sdw.c | 92 +++ drivers/soundwire/Kconfig | 37 + drivers/soundwire/Makefile | 18 + drivers/soundwire/bus.c | 958 +++++++++++++++++++++++++ drivers/soundwire/bus.h | 74 ++ drivers/soundwire/bus_type.c | 193 +++++ drivers/soundwire/cadence_master.c | 749 +++++++++++++++++++ drivers/soundwire/cadence_master.h | 48 ++ drivers/soundwire/intel.c | 347 +++++++++ drivers/soundwire/intel.h | 23 + drivers/soundwire/intel_init.c | 198 +++++ drivers/soundwire/mipi_disco.c | 374 ++++++++++ drivers/soundwire/slave.c | 115 +++ drivers/soundwire/sysfs.c | 343 +++++++++ include/linux/mod_devicetable.h | 6 + include/linux/regmap.h | 37 + include/linux/soundwire/sdw.h | 487 +++++++++++++ include/linux/soundwire/sdw_intel.h | 24 + include/linux/soundwire/sdw_registers.h | 194 +++++ include/linux/soundwire/sdw_type.h | 19 + scripts/mod/devicetable-offsets.c | 4 + scripts/mod/file2alias.c | 15 + 30 files changed, 4594 insertions(+) create mode 100644 Documentation/driver-api/soundwire/index.rst create mode 100644 Documentation/driver-api/soundwire/summary.rst create mode 100644 drivers/base/regmap/regmap-sdw.c create mode 100644 drivers/soundwire/Kconfig create mode 100644 drivers/soundwire/Makefile create mode 100644 drivers/soundwire/bus.c create mode 100644 drivers/soundwire/bus.h create mode 100644 drivers/soundwire/bus_type.c create mode 100644 drivers/soundwire/cadence_master.c create mode 100644 drivers/soundwire/cadence_master.h create mode 100644 drivers/soundwire/intel.c create mode 100644 drivers/soundwire/intel.h create mode 100644 drivers/soundwire/intel_init.c create mode 100644 drivers/soundwire/mipi_disco.c create mode 100644 drivers/soundwire/slave.c create mode 100644 drivers/soundwire/sysfs.c create mode 100644 include/linux/soundwire/sdw.h create mode 100644 include/linux/soundwire/sdw_intel.h create mode 100644 include/linux/soundwire/sdw_registers.h create mode 100644 include/linux/soundwire/sdw_type.h -- 2.7.4

2 45

[alsa-devel] [PATCH v3 1/2] ASoC: codecs: Add PCM186x binding documentation
by Andrew F. Davis 06 Dec '17

06 Dec '17

Add the dt-binding documentation for the TI PCM186x 2ch and 4ch Audio ADCs With Universal Front End. Signed-off-by: Andrew F. Davis <afd(a)ti.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes from v2: - None Changes from v1: - pcm186x@4a -> audio-codec@4a - Added Acked-by .../devicetree/bindings/sound/pcm186x.txt | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt diff --git a/Documentation/devicetree/bindings/sound/pcm186x.txt b/Documentation/devicetree/bindings/sound/pcm186x.txt new file mode 100644 index 000000000000..1087f4855980 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/pcm186x.txt @@ -0,0 +1,42 @@ +Texas Instruments PCM186x Universal Audio ADC + +These devices support both I2C and SPI (configured with pin strapping +on the board). + +Required properties: + + - compatible : "ti,pcm1862", + "ti,pcm1863", + "ti,pcm1864", + "ti,pcm1865" + + - reg : The I2C address of the device for I2C, the chip select + number for SPI. + + - avdd-supply: Analog core power supply (3.3v) + - dvdd-supply: Digital core power supply + - iovdd-supply: Digital IO power supply + See regulator/regulator.txt for more information + +CODEC input pins: + * VINL1 + * VINR1 + * VINL2 + * VINR2 + * VINL3 + * VINR3 + * VINL4 + * VINR4 + +The pins can be used in referring sound node's audio-routing property. + +Example: + + pcm186x: audio-codec@4a { + compatible = "ti,pcm1865"; + reg = <0x4a>; + + avdd-supply = <&reg_3v3_analog>; + dvdd-supply = <&reg_3v3>; + iovdd-supply = <&reg_1v8>; + }; -- 2.15.0

2 2

[alsa-devel] [PATCH v2 1/2] ASoC: codecs: Add PCM186x binding documentation
by Andrew F. Davis 06 Dec '17

06 Dec '17

Add the dt-binding documentation for the TI PCM186x 2ch and 4ch Audio ADCs With Universal Front End. Signed-off-by: Andrew F. Davis <afd(a)ti.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes from v1: - pcm186x@4a -> audio-codec@4a - Added Acked-by .../devicetree/bindings/sound/pcm186x.txt | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt diff --git a/Documentation/devicetree/bindings/sound/pcm186x.txt b/Documentation/devicetree/bindings/sound/pcm186x.txt new file mode 100644 index 000000000000..1087f4855980 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/pcm186x.txt @@ -0,0 +1,42 @@ +Texas Instruments PCM186x Universal Audio ADC + +These devices support both I2C and SPI (configured with pin strapping +on the board). + +Required properties: + + - compatible : "ti,pcm1862", + "ti,pcm1863", + "ti,pcm1864", + "ti,pcm1865" + + - reg : The I2C address of the device for I2C, the chip select + number for SPI. + + - avdd-supply: Analog core power supply (3.3v) + - dvdd-supply: Digital core power supply + - iovdd-supply: Digital IO power supply + See regulator/regulator.txt for more information + +CODEC input pins: + * VINL1 + * VINR1 + * VINL2 + * VINR2 + * VINL3 + * VINR3 + * VINL4 + * VINR4 + +The pins can be used in referring sound node's audio-routing property. + +Example: + + pcm186x: audio-codec@4a { + compatible = "ti,pcm1865"; + reg = <0x4a>; + + avdd-supply = <&reg_3v3_analog>; + dvdd-supply = <&reg_3v3>; + iovdd-supply = <&reg_1v8>; + }; -- 2.15.0

2 5

Re: [alsa-devel] [PATCH 5/8] ASoC: uniphier: add support for UniPhier AIO driver
by Mark Brown 06 Dec '17

06 Dec '17

On Wed, Dec 06, 2017 at 03:03:18PM +0900, Katsuhiro Suzuki wrote: > > I'd expect this code to be structured more like a library - have a > > driver that handles the specific IPs then have it call into a shared > > block of code that does the generic bits. Though in this case the > > device specific bit looks like a couple of tiny data tables so I'm not > > sure it's worth making it conditional or separate at all. > Sorry... I agree your opinion, but I can't imagine the detail. > I think my driver has structure as follows (ex. startup): > DAI: uniphier_aio_startup()(a)aio-core.c > Lib: uniphier_aio_init()(a)aio-regctrl.c > SoC specific: uniphier_aio_ld11_spec(a)aio-ld11.c > Am I wrong? Would you mean split the functions in aio-regctl.[ch] to other > kernel module? I wonder if you could tell me the example from existing > drivers. I'll try to fix my driver like as it. One example is how all the drivers that use the generic dmaengine code instantiate their DMA drivers, or how all the drivers for CODECs that have both I2C and SPIi control interfaces instantiate - given that the device specific code here seems to be mostly data tables that's probably the closest thing. > > At least. I do think we need to get to the bottom of how flexible the > > hardware is first though. > Yes, indeed. This hardware is more flexible and complex, but now I (and our > company) don't use it. Of course, I don't want to hide some features of this > hardware from ALSA people. I should try to upstream all features in the future, > I think. My main concern here is to make sure that when you decide you need to use the more complex hardware that this can be done without too much pain to existing machines (and that they can benefit from as much of the enhanced functionality as is possible).

1 0

[alsa-devel] [PATCH v4 0/2] Add support for TI TAS6424 digital amplifier
by Andrew F. Davis 06 Dec '17

06 Dec '17

Hello all, This series adds support for the TAS6424 digital amplifier. A lot has changed from the last time this upstreaming was attempted, I've taken over this effort for Michael and I don't really have an exact change log but hopefully I've addressed all comments from v3. Thanks, Andrew Andreas Dannenberg (1): ASoC: Add support for TAS6424 digital amplifier Michael Stecklein (1): dt-bindings: sound: add bindings for TAS6424 .../devicetree/bindings/sound/ti,tas6424.txt | 20 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas6424.c | 707 +++++++++++++++++++++ sound/soc/codecs/tas6424.h | 144 +++++ 5 files changed, 881 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,tas6424.txt create mode 100644 sound/soc/codecs/tas6424.c create mode 100644 sound/soc/codecs/tas6424.h -- 2.15.0

2 5

[alsa-devel] Question about soc-utils
by Kuninori Morimoto 06 Dec '17

06 Dec '17

Hi Mark, ALSA SoC ML In my understanding, "frame size" means "channel x physical width". linux/sound/core/pcm_native.c :: snd_pcm_hw_params() is doing so static int snd_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { ... => bits = snd_pcm_format_physical_width(runtime->format); runtime->sample_bits = bits; => bits *= runtime->channels; runtime->frame_bits = bits; ... } But, soc-utils::snd_soc_params_to_frame_size() is using snd_pcm_format_width() instead of snd_pcm_format_physical_width(), In "2ch x 24bit data with 32bit width" case, above "frame_bits" will be "64", but, below "frame size" will be "48", I think. Am I wrong ? int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params) { int sample_size; => sample_size = snd_pcm_format_width(params_format(params)); if (sample_size < 0) return sample_size; => return snd_soc_calc_frame_size(sample_size, params_channels(params), 1); } About "TDM slot", in my understanding it is TDM channel number. TDM6 = 6ch = 6 slot, TDM8 = 8ch = 8 slot. Am I wrong ?? I'm asking because soc-utils :: snd_soc_calc_bclk() / snd_soc_calc_frame_size() have both "channles" and "slot" parameter. What is this "tdm_slots" means ? int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots) int snd_soc_calc_bclk(int fs, int sample_size, int channels, int tdm_slots) Best regards --- Kuninori Morimoto

2 4

[alsa-devel] [PATCH v4 0/7] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Sriram Periyasamy 06 Dec '17

06 Dec '17

For certain platforms, clocks (mclk/sclk/fs) are required to be up before the stream start. Example: some codecs needs the mclk/sclk/fs to be enabled early for a successful clock synchronization. Some platforms require clock to be enabled at boot and be always ON. By sending set_dma_control IPC (with the i2s blobs queried from NHLT), these clocks can be enabled early after the firmware is downloaded. With this series, a virtual clock driver is created which provides interface to send the required IPCs from machine driver to enable the clocks. NHLT is parsed during probe and the clock information is populated. The pointer to blob is cached and sent along with the set_dma_control IPC structure during the clk prepare/unprepare callback. Clocks are created for a ssp if the nhlt table has endpoint configuration for that particular ssp. Skylake driver creates a platform driver with the clock information and register the clk ops callback. Kabylake machine driver uses the clock interface to enable the clocks early as it is required by the rt5663 driver for clock synchronization. v3 -> v4 - Add missing signed-offs v2 -> v3 - Moved the clk ops and IPCs from Skylake driver to clk driver and reordered commits accordingly - Add the support for extended I2S blob config which supports multiple mclk dividers in NHLT - Enable the clocks as well in DAPM PMU event instead of hw_params in machine drivers as confirmed by codec vendor - Do not register the clk if there is no valid clock source is avail in the I2S blob - Take care of error return in the clk driver - Address rest of the review comments and more optimization added - Fix the warning sound/soc/intel/skylake/skl.c:724:1-3: WARNING: PTR_ERR_OR_ZERO can be used reported by scripts/coccinelle/api/ptr_ret.cocci - Modified DSP replies as human readable to ease the debugging - Add firmware replies for MCLK/SCLK clocks if they are running already v1 -> v2 - Register parent clocks with skylake device. With the patch "clk: Add support for runtime PM" soon to be merged will help DSP to stay active on call to clock enable. Reference: (https://patchwork.kernel.org/patch/9911741/) - Fix the machine driver to enable clocks early for headphone playback path as well to fix a pop noise issue Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Naveen M (1): ASoC: Intel: eve: Enable mclk and ssp sclk early Sriram Periyasamy (3): ASoC: Intel: Skylake: Parse nhlt and register clock device ASoC: Intel: Skylake: Add ssp clock driver ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver Subhransu S. Prusty (2): ASoC: Intel: Skylake: Make DSP replies more human readable ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/Kconfig | 2 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 101 ++++- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 100 +++++ sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-i2s.h | 95 +++++ sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-nhlt.c | 172 ++++++++ sound/soc/intel/skylake/skl-ssp-clk.c | 470 +++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 117 +++++ sound/soc/intel/skylake/skl-sst-ipc.c | 50 ++- sound/soc/intel/skylake/skl.c | 93 ++++ sound/soc/intel/skylake/skl.h | 10 + 13 files changed, 1207 insertions(+), 12 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h -- 2.7.4

3 10

[alsa-devel] [PATCH 0/7] ASoC: don't use rtd->codec - step [6/6]
by Kuninori Morimoto 06 Dec '17

06 Dec '17

Hi Mark These are step [6/6] patch-set for converting codec/platform to conponent. rtd/dai have ->codec now, but it will be removed soon. Thus we need to use ->component instead of it. Kuninori Morimoto (7): ASoC: don't use rtd->codec on soc_dev_attr_is_visible() ASoC: don't use rtd->codec on snd_soc_new_compress() ASoC: don't use rtd->codec on fsl-asoc-card ASoC: don't use rtd->codec on intel/skylake ASoC: don't use rtd->codec on Intel/haswell ASoC: don't use rtd->codec on qcom/apq8016_sbc ASoC: don't use rtd->codec on samsung/bells sound/soc/fsl/fsl-asoc-card.c | 4 ++-- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 4 ++-- sound/soc/qcom/apq8016_sbc.c | 8 ++++---- sound/soc/samsung/bells.c | 40 +++++++++++++++++++-------------------- sound/soc/soc-compress.c | 4 ++-- sound/soc/soc-core.c | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) -- 1.9.1

2 13

[alsa-devel] [PATCH] ALSA: pcm: prevent UAF in snd_pcm_info
by Nick Desaulniers 05 Dec '17

05 Dec '17

From: Robb Glasser <rglasser(a)google.com> When the device descriptor is closed, the `substream->runtime` pointer is freed. But another thread may be in the ioctl handler, case SNDRV_CTL_IOCTL_PCM_INFO. This case calls snd_pcm_info_user() which calls snd_pcm_info() which accesses the now freed `substream->runtime`. Signed-off-by: Robb Glasser <rglasser(a)google.com> Signed-off-by: Nick Desaulniers <ndesaulniers(a)google.com> --- sound/core/pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 9070f277f8db..09ee8c6b9f75 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -153,7 +153,9 @@ static int snd_pcm_control_ioctl(struct snd_card *card, err = -ENXIO; goto _error; } + mutex_lock(&pcm->open_mutex); err = snd_pcm_info_user(substream, info); + mutex_unlock(&pcm->open_mutex); _error: mutex_unlock(&register_mutex); return err; -- 2.15.0.531.g2ccb3012c9-goog

4 5