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

[alsa-devel] [PATCH 0/2 v4] ALSA: pcm: anonymous dup implementation
by Jaroslav Kysela 12 Jun '20

12 Jun '20

This patchset contains the anonymous dup implementation with permissions checking for the ALSA's PCM interface in kernel to enable the restricted DMA sound buffer sharing for the restricted tasks. The code was tested through qemu and it seems to be pretty stable. The initial tinyalsa implementation can be found here: https://github.com/perexg/tinyalsa/commits/anondup v2 of the patches: - change clone parameter to subdevice number for the pcm attach - change SNDRV_PCM_PERM_MAX to SNDRV_PCM_PERM_MASK - the tinyalsa implementation was a little updated (restructured) v3 of the patches: - group integer declarations in snd_pcm_anonymous_dup() - replaced substream->pcm with pcm in snd_pcm_anonymous_dup() - added SNDRV_PCM_PERM_RW check for read/write/readv/writev syscalls v4 of the patches: - more simple restriction control (only two modes - full/buffer) - the tinyalsa implementation follows this change Cc: Phil Burk <philburk(a)google.com> Cc: Zach Riggle <riggle(a)google.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Leo Yan <leo.yan(a)linaro.org> Cc: Baolin Wang <baolin.wang(a)linaro.org> Jaroslav Kysela (2): ALSA: pcm: implement the anonymous dup (inode file descriptor) ALSA: pcm: implement the mmap buffer mode for the anonymous dup include/sound/pcm.h | 10 +++-- include/uapi/sound/asound.h | 6 ++- sound/core/oss/pcm_oss.c | 2 +- sound/core/pcm.c | 13 +++--- sound/core/pcm_compat.c | 1 + sound/core/pcm_native.c | 97 ++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 110 insertions(+), 19 deletions(-) -- 2.13.6

4 17

[PATCH v2 0/2] powerpc: Remove support for ppc405/440 Xilinx platforms
by Michal Simek 03 Jun '20

03 Jun '20

Hi, recently we wanted to update xilinx intc driver and we found that function which we wanted to remove is still wired by ancient Xilinx PowerPC platforms. Here is the thread about it. https://lore.kernel.org/linux-next/48d3232d-0f1d-42ea-3109-f44bbabfa2e8@xil… I have been talking about it internally and there is no interest in these platforms and it is also orphan for quite a long time. None is really running/testing these platforms regularly that's why I think it makes sense to remove them also with drivers which are specific to this platform. U-Boot support was removed in 2017 without anybody complain about it https://github.com/Xilinx/u-boot-xlnx/commit/98f705c9cefdfdba62c069821bbba1… Based on current ppc/next. If anyone has any objection about it, please let me know. Thanks, Michal Changes in v2: - Remove also sound/drivers/pcm-indirect2.[ch] files Reported-by: Takashi Iwai <tiwai(a)suse.de> - Based on my chat with Arnd I removed arch/powerpc/xmon/ changes done in v1 to keep them the same as before. (kbuild reported some issues with it too) Michal Simek (2): sound: ac97: Remove sound driver for ancient platform powerpc: Remove Xilinx PPC405/PPC440 support Documentation/devicetree/bindings/xilinx.txt | 143 -- Documentation/powerpc/bootwrapper.rst | 28 +- MAINTAINERS | 6 - arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/boot/Makefile | 7 +- arch/powerpc/boot/dts/Makefile | 1 - arch/powerpc/boot/dts/virtex440-ml507.dts | 406 ------ arch/powerpc/boot/dts/virtex440-ml510.dts | 466 ------- arch/powerpc/boot/ops.h | 1 - arch/powerpc/boot/serial.c | 5 - arch/powerpc/boot/uartlite.c | 79 -- arch/powerpc/boot/virtex.c | 97 -- arch/powerpc/boot/virtex405-head.S | 31 - arch/powerpc/boot/wrapper | 8 - arch/powerpc/configs/40x/virtex_defconfig | 75 - arch/powerpc/configs/44x/virtex5_defconfig | 74 - arch/powerpc/configs/ppc40x_defconfig | 8 - arch/powerpc/configs/ppc44x_defconfig | 8 - arch/powerpc/include/asm/xilinx_intc.h | 16 - arch/powerpc/include/asm/xilinx_pci.h | 21 - arch/powerpc/kernel/cputable.c | 39 - arch/powerpc/platforms/40x/Kconfig | 31 - arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/virtex.c | 54 - arch/powerpc/platforms/44x/Kconfig | 37 - arch/powerpc/platforms/44x/Makefile | 2 - arch/powerpc/platforms/44x/virtex.c | 60 - arch/powerpc/platforms/44x/virtex_ml510.c | 30 - arch/powerpc/platforms/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/xilinx_intc.c | 88 -- arch/powerpc/sysdev/xilinx_pci.c | 132 -- drivers/char/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 2 +- sound/drivers/Kconfig | 12 - sound/drivers/Makefile | 2 - sound/drivers/ml403-ac97cr.c | 1298 ------------------ sound/drivers/pcm-indirect2.c | 560 -------- sound/drivers/pcm-indirect2.h | 127 -- 39 files changed, 7 insertions(+), 3958 deletions(-) delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts delete mode 100644 arch/powerpc/boot/uartlite.c delete mode 100644 arch/powerpc/boot/virtex.c delete mode 100644 arch/powerpc/boot/virtex405-head.S delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h delete mode 100644 arch/powerpc/include/asm/xilinx_pci.h delete mode 100644 arch/powerpc/platforms/40x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c delete mode 100644 sound/drivers/ml403-ac97cr.c delete mode 100644 sound/drivers/pcm-indirect2.c delete mode 100644 sound/drivers/pcm-indirect2.h -- 2.26.0

5 12

Pioneer DJ DJM-900NXS2 support patches
by Dmitry Panchenko | d-Systems 01 Jun '20

01 Jun '20

Pioneer DJ DJM-900NXS2 is a widely used DJ mixer with 2 audio USB interfaces. Both have a MIDI controller, 10 playback and 12 capture channels. Audio endpoints are vendor-specific and 3 files need to be patched. All playback and capture channels work fine with all supported sample rates (44.1k, 48k, 96k). Patches are attached. -- Kind regards, Dmitry Panchenko d-Systems Ltd Lai 6, Tartu 51005, Estonia www.d-systems.ee

3 5

[PATCH 0/4] Kconfig updates for DMIC and SOF HDMI support
by Ranjani Sridharan 27 May '20

27 May '20

This series provides the following updtes to the Intel machine driver Kconfig: 1. The first patch adds the explicit dependency on GPIOLIB when SND_SOC_DMIC is selected. 2. SND_SOC_SOF_HDA_AUDIO_CODEC is required for using the legacy HDA codec driver for HDMI support in SOF. The last 3 three patches make the required changes to account for this. Libin Yang (3): ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common hdmi ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition Pierre-Louis Bossart (1): ASoC: Intel: boards: add explicit dependency on GPIOLIB when DMIC is used sound/soc/intel/boards/Kconfig | 51 ++++++++++++++------------- sound/soc/intel/boards/sof_pcm512x.c | 9 ----- sound/soc/intel/boards/sof_sdw.c | 8 ----- sound/soc/intel/boards/sof_sdw_hdmi.c | 7 ---- 4 files changed, 26 insertions(+), 49 deletions(-) -- 2.17.1

3 9

[PATCH RESEND 0/4] Minor WM8994 MFD/codec fixes
by Marek Szyprowski 22 May '20

22 May '20

Hi! This is a resend of the minor WM8994 MFD/codec driver fixes posted in last days of the February 2020: https://lore.kernel.org/patchwork/project/lkml/list/?series=431296 https://lore.kernel.org/patchwork/project/lkml/list/?series=431721 I hope this time the patches will find their way to mainline. Best regards, Marek Szyprowski Patch summary: Marek Szyprowski (4): mfd: wm8994: Fix driver operation if loaded as modules mfd: wm8994: Fix unbalanced calls to regulator_bulk_disable() mfd: wm8994: Silence warning about supplies during deferred probe ASoC: wm8994: Silence warnings during deferred probe drivers/mfd/wm8994-core.c | 8 +++++++- sound/soc/codecs/wm8994.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.17.1

4 17

[PATCH 0/2] powerpc: Remove support for ppc405/440 Xilinx platforms
by Michal Simek 21 May '20

21 May '20

Hi, recently we wanted to update xilinx intc driver and we found that function which we wanted to remove is still wired by ancient Xilinx PowerPC platforms. Here is the thread about it. https://lore.kernel.org/linux-next/48d3232d-0f1d-42ea-3109-f44bbabfa2e8@xil… I have been talking about it internally and there is no interest in these platforms and it is also orphan for quite a long time. None is really running/testing these platforms regularly that's why I think it makes sense to remove them also with drivers which are specific to this platform. U-Boot support was removed in 2017 without anybody complain about it https://github.com/Xilinx/u-boot-xlnx/commit/98f705c9cefdfdba62c069821bbba1… Based on current ppc/next. If anyone has any objection about it, please let me know. Thanks, Michal Michal Simek (2): sound: ac97: Remove sound driver for ancient platform powerpc: Remove Xilinx PPC405/PPC440 support Documentation/devicetree/bindings/xilinx.txt | 143 -- Documentation/powerpc/bootwrapper.rst | 28 +- MAINTAINERS | 6 - arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/boot/Makefile | 7 +- arch/powerpc/boot/dts/Makefile | 1 - arch/powerpc/boot/dts/virtex440-ml507.dts | 406 ------ arch/powerpc/boot/dts/virtex440-ml510.dts | 466 ------- arch/powerpc/boot/ops.h | 1 - arch/powerpc/boot/serial.c | 5 - arch/powerpc/boot/uartlite.c | 79 -- arch/powerpc/boot/virtex.c | 97 -- arch/powerpc/boot/virtex405-head.S | 31 - arch/powerpc/boot/wrapper | 8 - arch/powerpc/configs/40x/virtex_defconfig | 75 - arch/powerpc/configs/44x/virtex5_defconfig | 74 - arch/powerpc/configs/ppc40x_defconfig | 8 - arch/powerpc/configs/ppc44x_defconfig | 8 - arch/powerpc/include/asm/xilinx_intc.h | 16 - arch/powerpc/include/asm/xilinx_pci.h | 21 - arch/powerpc/kernel/cputable.c | 39 - arch/powerpc/platforms/40x/Kconfig | 31 - arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/virtex.c | 54 - arch/powerpc/platforms/44x/Kconfig | 37 - arch/powerpc/platforms/44x/Makefile | 2 - arch/powerpc/platforms/44x/virtex.c | 60 - arch/powerpc/platforms/44x/virtex_ml510.c | 30 - arch/powerpc/platforms/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/xilinx_intc.c | 88 -- arch/powerpc/sysdev/xilinx_pci.c | 132 -- arch/powerpc/xmon/ppc-dis.c | 6 - arch/powerpc/xmon/ppc-opc.c | 23 - arch/powerpc/xmon/ppc.h | 5 - drivers/char/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 2 +- sound/drivers/Kconfig | 12 - sound/drivers/Makefile | 2 - sound/drivers/ml403-ac97cr.c | 1298 ------------------ 40 files changed, 7 insertions(+), 3305 deletions(-) delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts delete mode 100644 arch/powerpc/boot/uartlite.c delete mode 100644 arch/powerpc/boot/virtex.c delete mode 100644 arch/powerpc/boot/virtex405-head.S delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h delete mode 100644 arch/powerpc/include/asm/xilinx_pci.h delete mode 100644 arch/powerpc/platforms/40x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c delete mode 100644 sound/drivers/ml403-ac97cr.c -- 2.26.0

10 29

[PATCH 1/5] drivers/powerpc: Replace _ALIGN_UP() by ALIGN()
by Christophe Leroy 20 May '20

20 May '20

_ALIGN_UP() is specific to powerpc ALIGN() is generic and does the same Replace _ALIGN_UP() by ALIGN() Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- drivers/ps3/ps3-lpm.c | 6 +++--- drivers/vfio/pci/vfio_pci_nvlink2.c | 2 +- drivers/video/fbdev/ps3fb.c | 4 ++-- sound/ppc/snd_ps3.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c index 83c45659bc9d..064b5884ba13 100644 --- a/drivers/ps3/ps3-lpm.c +++ b/drivers/ps3/ps3-lpm.c @@ -1096,8 +1096,8 @@ int ps3_lpm_open(enum ps3_lpm_tb_type tb_type, void *tb_cache, lpm_priv->tb_cache_internal = NULL; lpm_priv->tb_cache = NULL; } else if (tb_cache) { - if (tb_cache != (void *)_ALIGN_UP((unsigned long)tb_cache, 128) - || tb_cache_size != _ALIGN_UP(tb_cache_size, 128)) { + if (tb_cache != (void *)ALIGN((unsigned long)tb_cache, 128) + || tb_cache_size != ALIGN(tb_cache_size, 128)) { dev_err(sbd_core(), "%s:%u: unaligned tb_cache\n", __func__, __LINE__); result = -EINVAL; @@ -1116,7 +1116,7 @@ int ps3_lpm_open(enum ps3_lpm_tb_type tb_type, void *tb_cache, result = -ENOMEM; goto fail_malloc; } - lpm_priv->tb_cache = (void *)_ALIGN_UP( + lpm_priv->tb_cache = (void *)ALIGN( (unsigned long)lpm_priv->tb_cache_internal, 128); } diff --git a/drivers/vfio/pci/vfio_pci_nvlink2.c b/drivers/vfio/pci/vfio_pci_nvlink2.c index ed20d73cc27c..65c61710c0e9 100644 --- a/drivers/vfio/pci/vfio_pci_nvlink2.c +++ b/drivers/vfio/pci/vfio_pci_nvlink2.c @@ -67,7 +67,7 @@ static size_t vfio_pci_nvgpu_rw(struct vfio_pci_device *vdev, * * This is not fast path anyway. */ - sizealigned = _ALIGN_UP(posoff + count, PAGE_SIZE); + sizealigned = ALIGN(posoff + count, PAGE_SIZE); ptr = ioremap_cache(data->gpu_hpa + posaligned, sizealigned); if (!ptr) return -EFAULT; diff --git a/drivers/video/fbdev/ps3fb.c b/drivers/video/fbdev/ps3fb.c index 834f63edf700..9df78fb77267 100644 --- a/drivers/video/fbdev/ps3fb.c +++ b/drivers/video/fbdev/ps3fb.c @@ -44,7 +44,7 @@ #define GPU_CMD_BUF_SIZE (2 * 1024 * 1024) #define GPU_FB_START (64 * 1024) #define GPU_IOIF (0x0d000000UL) -#define GPU_ALIGN_UP(x) _ALIGN_UP((x), 64) +#define GPU_ALIGN_UP(x) ALIGN((x), 64) #define GPU_MAX_LINE_LENGTH (65536 - 64) #define GPU_INTR_STATUS_VSYNC_0 0 /* vsync on head A */ @@ -1015,7 +1015,7 @@ static int ps3fb_probe(struct ps3_system_bus_device *dev) } #endif - max_ps3fb_size = _ALIGN_UP(GPU_IOIF, 256*1024*1024) - GPU_IOIF; + max_ps3fb_size = ALIGN(GPU_IOIF, 256*1024*1024) - GPU_IOIF; if (ps3fb_videomemory.size > max_ps3fb_size) { dev_info(&dev->core, "Limiting ps3fb mem size to %lu bytes\n", max_ps3fb_size); diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 6d2a33b8faa0..b8161a08f2ca 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -926,7 +926,7 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) PAGE_SHIFT, /* use system page size */ 0, /* dma type; not used */ NULL, - _ALIGN_UP(SND_PS3_DMA_REGION_SIZE, PAGE_SIZE)); + ALIGN(SND_PS3_DMA_REGION_SIZE, PAGE_SIZE)); dev->d_region->ioid = PS3_AUDIO_IOID; ret = ps3_dma_region_create(dev->d_region); -- 2.25.0

4 11

[PATCH 0/3] soundwire: bus_type: add sdw_master_device support
by Bard Liao 13 May '20

13 May '20

This series adds sdw master devices support. Pierre-Louis Bossart (3): soundwire: bus: rename sdw_bus_master_add/delete, add arguments soundwire: bus_type: introduce sdw_slave_type and sdw_master_type soundwire: bus_type: add sdw_master_device support .../driver-api/soundwire/summary.rst | 7 +- drivers/soundwire/Makefile | 2 +- drivers/soundwire/bus.c | 27 ++++--- drivers/soundwire/bus.h | 3 + drivers/soundwire/bus_type.c | 19 +++-- drivers/soundwire/intel.c | 9 ++- drivers/soundwire/master.c | 79 +++++++++++++++++++ drivers/soundwire/qcom.c | 7 +- drivers/soundwire/slave.c | 8 +- include/linux/soundwire/sdw.h | 22 +++++- include/linux/soundwire/sdw_type.h | 9 ++- 11 files changed, 160 insertions(+), 32 deletions(-) create mode 100644 drivers/soundwire/master.c -- 2.17.1

4 15

[alsa-devel] [PATCH] sound/soc: only first codec is master in multicodec setup
by Johannes Krude 11 May '20

11 May '20

When using multiple codecs, at most one codec should generate the master clock. All codecs except the first are therefore configured for slave mode. Before this patch all codecs in a multicodec setup had to be slaves. This is needed when e.g., connecting multiple sound hats for simultaneous playback to the raspberry pi I2S output and one of the sound hats generates the I2S clocks (https://github.com/raspberrypi/linux/pull/3337). I checked the raspberry pi kernel tree for multicodec usage with `fgrep num_codecs -R sound/soc/` and verified that all existing multicodec drivers with hardcoded format have indeed configured all codecs for slave mode. Doing a similar check on the current for-5.5 tree is more difficult since .num_codecs is now hidden behind a preprocessor macro. Signed-off-by: Johannes Krude <johannes(a)krude.de> --- sound/soc/soc-core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 058e038df..cb8952527 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1688,6 +1688,14 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, for_each_rtd_codec_dai(rtd, i, codec_dai) { + unsigned int codec_dai_fmt = dai_fmt; + - ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt); + // there can only be one master when using multiple codecs + if (i && (codec_dai_fmt & SND_SOC_DAIFMT_MASTER_MASK)) { + codec_dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK; + codec_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; + } + + ret = snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); if (ret != 0 && ret != -ENOTSUPP) { dev_warn(codec_dai->dev, "ASoC: Failed to set DAI format: %d\n", ret); -- 2.17.1

2 2

[PATCH] ASoC: core: Make sure component driver names are unique
by Ranjani Sridharan 10 May '20

10 May '20

When registering a component, make sure that the driver names are unique. This will ensure that the snd_soc_rtdcom_lookup() function returns the right component based on the name. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/soc-core.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8321e75ff244..00c1f8ce46af 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -286,14 +286,6 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, if (!driver_name) return NULL; - /* - * NOTE - * - * snd_soc_rtdcom_lookup() will find component from rtd by using - * specified driver name. - * But, if many components which have same driver name are connected - * to 1 rtd, this function will return 1st found component. - */ for_each_rtd_components(rtd, i, component) { const char *component_name = component->driver->name; @@ -2640,6 +2632,22 @@ int snd_soc_add_component(struct device *dev, } EXPORT_SYMBOL_GPL(snd_soc_add_component); +static bool +snd_soc_component_driver_name_is_unique(const struct snd_soc_component_driver *component_driver) +{ + struct snd_soc_component *component; + + mutex_lock(&client_mutex); + for_each_component(component) + if (!strcmp(component->driver->name, component_driver->name)) { + mutex_unlock(&client_mutex); + return false; + } + + mutex_unlock(&client_mutex); + return true; +} + int snd_soc_register_component(struct device *dev, const struct snd_soc_component_driver *component_driver, struct snd_soc_dai_driver *dai_drv, @@ -2647,6 +2655,13 @@ int snd_soc_register_component(struct device *dev, { struct snd_soc_component *component; + if (component_driver->name && + !snd_soc_component_driver_name_is_unique(component_driver)) { + dev_err(dev, "component driver name %s is not unique\n", + component_driver->name); + return -EINVAL; + } + component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL); if (!component) return -ENOMEM; -- 2.17.1

3 6