August 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH 00/12] ASoC: soc-dapm: cleanup cppcheck warning
by Kuninori Morimoto 06 Aug '21

06 Aug '21

Hi Mark Now I'm posting audio-graph-card2 patch-set, but it seems it needs longer discussion. Thus I want to post more easy patch first, and reduce my local patches. These are cppcheck warning cleanup patches for soc-dapm. Kuninori Morimoto (12): ASoC: soc-dapm: cleanup cppcheck warning at dapm_wcache_lookup() ASoC: soc-dapm: cleanup cppcheck warning at dapm_connect_mux() ASoC: soc-dapm: cleanup cppcheck warning at dapm_set_mixer_path_status() ASoC: soc-dapm: cleanup cppcheck warning at dapm_new_pga() ASoC: soc-dapm: cleanup cppcheck warning at dapm_new_dai_link() ASoC: soc-dapm: cleanup cppcheck warning at dapm_seq_check_event() ASoC: soc-dapm: cleanup cppcheck warning at dapm_seq_run() ASoC: soc-dapm: cleanup cppcheck warning at snd_soc_dapm_del_route() ASoC: soc-dapm: cleanup cppcheck warning at snd_soc_dapm_add_routes() ASoC: soc-dapm: cleanup cppcheck warning at snd_soc_dapm_weak_routes() ASoC: soc-dapm: cleanup cppcheck warning at snd_soc_dapm_new_controls() ASoC: soc-dapm: cleanup cppcheck warning at soc_dapm_dai_stream_event() sound/soc/soc-dapm.c | 65 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 32 deletions(-) -- 2.25.1

2 13

[PATCH v1] ASoC: rt5640: Silence warning message about missing interrupt
by Dmitry Osipenko 06 Aug '21

06 Aug '21

Interrupt is optional for the RT5640 codec. Nexus 7 doesn't use interrupt, this results in a noisy warning message that looks like a error condition. Make interrupt explicitly optional to silence the message, use modern IRQF_NO_AUTOEN flag and correct the reg[q]uest typo in the message. Signed-off-by: Dmitry Osipenko <digetx(a)gmail.com> --- sound/soc/codecs/rt5640.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 9523f4b5c800..0f5087a7644b 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2836,15 +2836,18 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, if (ret) return ret; - ret = devm_request_irq(&i2c->dev, rt5640->irq, rt5640_irq, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING - | IRQF_ONESHOT, "rt5640", rt5640); - if (ret == 0) { - /* Gets re-enabled by rt5640_set_jack() */ - disable_irq(rt5640->irq); + if (rt5640->irq) { + /* enabled by rt5640_set_jack() */ + ret = devm_request_irq(&i2c->dev, rt5640->irq, rt5640_irq, + IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN | + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "rt5640", rt5640); + if (ret) { + dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n", + rt5640->irq, ret); + return ret; + } } else { - dev_warn(&i2c->dev, "Failed to reguest IRQ %d: %d\n", - rt5640->irq, ret); rt5640->irq = -ENXIO; } -- 2.32.0

2 1

[PATCH] ALSA: usb-audio: fix incorrect clock source setting
by chihhao.chen＠mediatek.com 06 Aug '21

06 Aug '21

From: "chihhao.chen" <chihhao.chen(a)mediatek.com> The following scenario describes an echo test for Samsung USBC Headset (AKG) with VID/PID (0x04e8/0xa051). We first start a capture stream(USB IN transfer) in 96Khz/24bit/1ch mode. In clock find source function, we get value 0x2 for clock selector and 0x1 for clock source. Kernel-4.14 behavior Since clock source is valid so clock selector was not set again. We pass through this function and start a playback stream(USB OUT transfer) in 48Khz/32bit/2ch mode. This time we get value 0x1 for clock selector and 0x1 for clock source. Finally clock id with this setting is 0x9. Kernel-5.10 behavior Clock selector was always set one more time even it is valid. When we start a playback stream, we will get 0x2 for clock selector and 0x1 for clock source. In this case clock id becomes 0xA. This is an incorrect clock source setting and results in severe noises. We see wrong data rate in USB IN transfer. (From 288 bytes/ms becomes 144 bytes/ms) It should keep in 288 bytes/ms. This earphone works fine on older kernel version load because this is a newly-added behavior. Signed-off-by: chihhao.chen <chihhao.chen(a)mediatek.com> --- sound/usb/clock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 52de522..14456f6 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -324,6 +324,12 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, sources[ret - 1], visited, validate); if (ret > 0) { + /* + * For Samsung USBC Headset (AKG), setting clock selector again + * will result in incorrect default clock setting problems + */ + if (chip->usb_id == USB_ID(0x04e8, 0xa051)) + return ret; err = uac_clock_selector_set_val(chip, entity_id, cur); if (err < 0) return err; -- 1.7.9.5

4 15

[PATCH v3 0/3] Add RZ/G2L Sound support
by Biju Das 05 Aug '21

05 Aug '21

This patch series aims to add ASoC support on RZ/G2L SoC's. It is based on the work done by Chris Brandt for RZ/A ASoC driver. v2->v3: * Fixed the dependency on KCONFIG * Merged the binding patch with dma feature added * Updated dt binding example with encoded #dma-cells value. * Improved Error handling in probe function * Removed the passing legacy channel configuration parameters from dmaengine_slave_config function * started using dma_request_chan instead of deprecated dma_request_slave_channel * Removed SoC dtsi and config patches from this series. Will send it later. v1->v2: * Rebased to latest rc kernel Biju Das (3): ASoC: dt-bindings: Document RZ/G2L bindings sound: soc: sh: Add RZ/G2L SSIF-2 driver sound: sh: rz-ssi: Add SSI DMAC support .../bindings/sound/renesas,rz-ssi.yaml | 100 ++ sound/soc/sh/Kconfig | 9 + sound/soc/sh/Makefile | 4 + sound/soc/sh/rz-ssi.c | 1062 +++++++++++++++++ 4 files changed, 1175 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml create mode 100644 sound/soc/sh/rz-ssi.c -- 2.17.1

3 8

[PATCH] ALSA: pci/korg1212: completely remove 'set but not used' warnings
by Pierre-Louis Bossart 05 Aug '21

05 Aug '21

Commit 6cdc01ebdfb0 ("ALSA: pci/korg1212: remove 'set but not used' warnings") missed one __maybe_unused, add to enable make W=1 sound/ compilation with x86_64 allmodconfig Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/pci/korg1212/korg1212.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 49ed2bfaf11f..5c9e240ff6a9 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2094,7 +2094,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci) { int err, rc; unsigned int i; - unsigned iomem_size; + __maybe_unused unsigned iomem_size; __maybe_unused unsigned ioport_size; __maybe_unused unsigned iomem2_size; struct snd_korg1212 *korg1212 = card->private_data; -- 2.25.1

2 1

[PATCH] ALSA: es1688: Avoid devres management for es1688 object creation
by Takashi Iwai 05 Aug '21

05 Aug '21

The recent refactoring of es1688 object creation with the use of devres caused a problem with the non-PnP probe of GUS driver, as it tries to probe multiple times with different parameters That is, this object needs the immediate resource release and the devres doesn't fit for it. This patch reverts partially the commit for restoring the classic resource management for es1688 object. Fixes: 1bb11c1c7f6e ("ALSA: es1688: Allocate resources with device-managed APIs") Reported-by: kernel test robot <oliver.sang(a)intel.com> Link: https://lore.kernel.org/r/20210805032513.GA30485@xsang-OptiPlex-9020 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/es1688.h | 1 + sound/isa/es1688/es1688_lib.c | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/sound/es1688.h b/include/sound/es1688.h index da577bbf9cc7..099569c31fbb 100644 --- a/include/sound/es1688.h +++ b/include/sound/es1688.h @@ -18,6 +18,7 @@ struct snd_es1688 { unsigned long port; /* port of ESS chip */ + struct resource *res_port; unsigned long mpu_port; /* MPU-401 port of ESS chip */ int irq; /* IRQ number of ESS chip */ int mpu_irq; /* MPU IRQ */ diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index 9cd66b236cef..8554cb2263c1 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c @@ -580,6 +580,13 @@ static int snd_es1688_free(struct snd_es1688 *chip) { if (chip->hardware != ES1688_HW_UNDEF) snd_es1688_init(chip, 0); + release_and_free_resource(chip->res_port); + if (chip->irq >= 0) + free_irq(chip->irq, (void *) chip); + if (chip->dma8 >= 0) { + disable_dma(chip->dma8); + free_dma(chip->dma8); + } return 0; } @@ -617,25 +624,26 @@ int snd_es1688_create(struct snd_card *card, chip->dma8 = -1; chip->hardware = ES1688_HW_UNDEF; - if (!devm_request_region(card->dev, port + 4, 12, "ES1688")) { + chip->res_port = request_region(port + 4, 12, "ES1688"); + if (chip->res_port == NULL) { snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4); - return -EBUSY; + err = -EBUSY; + goto exit; } - err = devm_request_irq(card->dev, irq, snd_es1688_interrupt, 0, - "ES1688", (void *) chip); + err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip); if (err < 0) { snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq); - return err; + goto exit; } chip->irq = irq; card->sync_irq = chip->irq; - err = snd_devm_request_dma(card->dev, dma8, "ES1688"); + err = request_dma(dma8, "ES1688"); if (err < 0) { snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8); - return err; + goto exit; } chip->dma8 = dma8; @@ -651,14 +659,17 @@ int snd_es1688_create(struct snd_card *card, err = snd_es1688_probe(chip); if (err < 0) - return err; + goto exit; err = snd_es1688_init(chip, 1); if (err < 0) - return err; + goto exit; /* Register device */ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); +exit: + if (err) + snd_es1688_free(chip); return err; } -- 2.26.2

1 0

[PATCH] ASoC: qcom: apq8016_sbc: Add SEC_MI2S support
by Vincent Knecht 04 Aug '21

04 Aug '21

This patch adds external codec support on secondary mi2s. It is used for headphones on some devices, eg. alcatel-idol347. Signed-off-by: Vincent Knecht <vincent.knecht(a)mailoo.org> --- sound/soc/qcom/apq8016_sbc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 08a05f0ecad7..53460272eb1e 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -30,6 +30,11 @@ struct apq8016_sbc_data { #define MIC_CTRL_QUA_WS_SLAVE_SEL_10 BIT(17) #define MIC_CTRL_TLMM_SCLK_EN BIT(1) #define SPKR_CTL_PRI_WS_SLAVE_SEL_11 (BIT(17) | BIT(16)) +#define SPKR_CTL_TLMM_MCLK_EN BIT(1) +#define SPKR_CTL_TLMM_SCLK_EN BIT(2) +#define SPKR_CTL_TLMM_DATA1_EN BIT(3) +#define SPKR_CTL_TLMM_WS_OUT_SEL BIT(6) +#define SPKR_CTL_TLMM_WS_EN_SEL BIT(18) #define DEFAULT_MCLK_RATE 9600000 static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) @@ -53,6 +58,13 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) MIC_CTRL_TLMM_SCLK_EN, pdata->mic_iomux); break; + case MI2S_SECONDARY: + /* Configure the Sec MI2S to TLMM */ + writel(readl(pdata->spkr_iomux) | SPKR_CTL_TLMM_MCLK_EN | + SPKR_CTL_TLMM_SCLK_EN | SPKR_CTL_TLMM_DATA1_EN | + SPKR_CTL_TLMM_WS_OUT_SEL | SPKR_CTL_TLMM_WS_EN_SEL, + pdata->spkr_iomux); + break; case MI2S_TERTIARY: writel(readl(pdata->mic_iomux) | MIC_CTRL_TER_WS_SLAVE_SEL | MIC_CTRL_TLMM_SCLK_EN, -- 2.31.1

2 1

[PATCH] ASoC: amd: vangogh: Drop superfluous mmap callback
by Takashi Iwai 04 Aug '21

04 Aug '21

The mmap callback of vangogh driver just calls the default mmap handler, and it's superfluous, as the PCM core would call it if not set. Let's drop the superfluous mmap callback. Fixes: 361414dc1f07 ("ASoC: amd: add vangogh i2s dma driver pm ops") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c index 9f8eb72ac834..f10de38976cb 100644 --- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c +++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c @@ -315,13 +315,6 @@ static int acp5x_dma_new(struct snd_soc_component *component, return 0; } -static int acp5x_dma_mmap(struct snd_soc_component *component, - struct snd_pcm_substream *substream, - struct vm_area_struct *vma) -{ - return snd_pcm_lib_default_mmap(substream, vma); -} - static int acp5x_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { @@ -364,7 +357,6 @@ static const struct snd_soc_component_driver acp5x_i2s_component = { .close = acp5x_dma_close, .hw_params = acp5x_dma_hw_params, .pointer = acp5x_dma_pointer, - .mmap = acp5x_dma_mmap, .pcm_construct = acp5x_dma_new, }; -- 2.26.2

2 1

[PATCH 00/15] ALSA: Improved WC memory handling
by Takashi Iwai 04 Aug '21

04 Aug '21

Hi, this is a patchset to enhance the ALSA memory allocation helper to support the allocation of WC pages more generically as well as supporting the fixed size buffer allocation. It allows us to reduce lots of redundant code in various ASoC drivers that still haven't used the standard preallocation. Takashi === Takashi Iwai (15): ALSA: memalloc: Minor refactoring ALSA: memalloc: Correctly name as WC ALSA: pcm: Allow exact buffer preallocation ALSA: memalloc: Support WC allocation on all architectures ALSA: pxa2xx: Use managed PCM buffer allocation ASoC: bcm: Use managed PCM buffer allocation ASoC: fsl: imx-pcm-fiq: Use managed buffer allocation ASoC: fsl: imx-pcm-rpmsg: Use managed buffer allocation ASoC: tegra: Use managed buffer allocation ASoC: fsl_asrc_dma: Use managed buffer allocation ASoC: fsl_dma: Use managed buffer allocation ASoC: mpc5200: Use managed buffer allocation ASoC: qcom: lpass: Use managed buffer allocation ASoC: qcom: qdsp6: Use managed buffer allocation ASoC: sprd: Use managed buffer allocation include/sound/memalloc.h | 6 +- include/sound/pcm.h | 47 ++++++++++++-- include/sound/pxa2xx-lib.h | 13 +--- sound/arm/pxa2xx-ac97.c | 18 ++---- sound/arm/pxa2xx-pcm-lib.c | 90 ++------------------------ sound/core/memalloc.c | 94 +++++++++++++++++----------- sound/core/memalloc_local.h | 2 +- sound/core/pcm_memory.c | 67 +++++++++++++++----- sound/core/sgbuf.c | 21 ++++--- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/intel8x0.c | 2 +- sound/soc/bcm/bcm63xx-pcm-whistler.c | 82 ++---------------------- sound/soc/fsl/fsl_asrc_dma.c | 47 +------------- sound/soc/fsl/fsl_dma.c | 50 +-------------- sound/soc/fsl/imx-pcm-fiq.c | 75 +--------------------- sound/soc/fsl/imx-pcm-rpmsg.c | 89 +------------------------- sound/soc/fsl/mpc5200_dma.c | 63 +------------------ sound/soc/pxa/pxa-ssp.c | 3 - sound/soc/pxa/pxa2xx-ac97.c | 3 - sound/soc/pxa/pxa2xx-i2s.c | 3 - sound/soc/pxa/pxa2xx-pcm.c | 3 - sound/soc/qcom/lpass-platform.c | 60 +----------------- sound/soc/qcom/qdsp6/q6asm-dai.c | 63 +------------------ sound/soc/sprd/sprd-pcm-dma.c | 67 +------------------- sound/soc/tegra/tegra210_admaif.c | 6 -- sound/soc/tegra/tegra_pcm.c | 93 +-------------------------- sound/soc/tegra/tegra_pcm.h | 7 --- sound/x86/intel_hdmi_audio.c | 2 +- 29 files changed, 209 insertions(+), 871 deletions(-) === Cc: Banajit Goswami <bgoswami(a)codeaurora.org> Cc: Daniel Mack <daniel(a)zonque.org> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Haojian Zhuang <haojian.zhuang(a)gmail.com> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Robert Jarzmik <robert.jarzmik(a)free.fr> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> -- 2.26.2

3 18

[PATCH v2] ALSA: memalloc: Store snd_dma_buffer.addr for continuous pages, too
by Takashi Iwai 04 Aug '21

04 Aug '21

In the recent fix commit eda80d7c9c4d ("ALSA: memalloc: Fix regression with SNDRV_DMA_TYPE_CONTINUOUS"), we replaced the pfn argument of the remap_page_pfn() call from the uninitialized dmab->addr. It was the right fix, but it'd be more generic if we actually initialize dmab->area for SNDRV_DMA_TYPE_CONTINOUS, too. e.g. the field is used in the common snd_sgbuf_get_addr(), too. This patch adds the initialization of addr field and does revert of the previous change to refer to it again in the mmap call. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: Fix a wrong buffer pointer to convert sound/core/memalloc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 084b2600a423..1cea8cb9668f 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -242,8 +242,11 @@ EXPORT_SYMBOL(snd_sgbuf_get_chunk_size); static void *snd_dma_continuous_alloc(struct snd_dma_buffer *dmab, size_t size) { gfp_t gfp = snd_mem_get_gfp_flags(dmab, GFP_KERNEL); + void *p = alloc_pages_exact(size, gfp); - return alloc_pages_exact(size, gfp); + if (p) + dmab->addr = page_to_phys(virt_to_page(p)); + return p; } static void snd_dma_continuous_free(struct snd_dma_buffer *dmab) @@ -255,7 +258,7 @@ static int snd_dma_continuous_mmap(struct snd_dma_buffer *dmab, struct vm_area_struct *area) { return remap_pfn_range(area, area->vm_start, - page_to_pfn(virt_to_page(dmab->area)), + dmab->addr >> PAGE_SHIFT, area->vm_end - area->vm_start, area->vm_page_prot); } -- 2.26.2

1 0