November 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH 1/4] ASoC: SOF: amd: Fix for reading position updates from stream box.
by V sujith kumar Reddy 15 Nov '22

15 Nov '22

By default the position updates are read from dsp box when streambox size is not defined.if the streambox size is defined to some value then position updates can be read from the streambox. Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> --- sound/soc/sof/amd/acp-common.c | 1 + sound/soc/sof/amd/acp-ipc.c | 30 +++++++++++++++++++++++++++++- sound/soc/sof/amd/acp.h | 4 ++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c index 27b95187356e..150e042e4039 100644 --- a/sound/soc/sof/amd/acp-common.c +++ b/sound/soc/sof/amd/acp-common.c @@ -76,6 +76,7 @@ struct snd_sof_dsp_ops sof_acp_common_ops = { /*IPC */ .send_msg = acp_sof_ipc_send_msg, .ipc_msg_data = acp_sof_ipc_msg_data, + .set_stream_data_offset = acp_set_stream_data_offset, .get_mailbox_offset = acp_sof_ipc_get_mailbox_offset, .get_window_offset = acp_sof_ipc_get_window_offset, .irq_thread = acp_sof_ipc_irq_thread, diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c index dd030566e372..dd6e53c63407 100644 --- a/sound/soc/sof/amd/acp-ipc.c +++ b/sound/soc/sof/amd/acp-ipc.c @@ -192,13 +192,41 @@ int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *sub { unsigned int offset = sdev->dsp_box.offset; - if (!substream || !sdev->stream_box.size) + if (!substream || !sdev->stream_box.size) { acp_mailbox_read(sdev, offset, p, sz); + } else { + struct acp_dsp_stream *stream = substream->runtime->private_data; + + if (!stream) + return -ESTRPIPE; + + acp_mailbox_read(sdev, stream->posn_offset, p, sz); + } return 0; } EXPORT_SYMBOL_NS(acp_sof_ipc_msg_data, SND_SOC_SOF_AMD_COMMON); +int acp_set_stream_data_offset(struct snd_sof_dev *sdev, + struct snd_pcm_substream *substream, + size_t posn_offset) +{ + struct acp_dsp_stream *stream = substream->runtime->private_data; + + /* check for unaligned offset or overflow */ + if (posn_offset > sdev->stream_box.size || + posn_offset % sizeof(struct sof_ipc_stream_posn) != 0) + return -EINVAL; + + stream->posn_offset = sdev->stream_box.offset + posn_offset; + + dev_dbg(sdev->dev, "pcm: stream dir %d, posn mailbox offset is %zu", + substream->stream, stream->posn_offset); + + return 0; +} +EXPORT_SYMBOL_NS(acp_set_stream_data_offset, SND_SOC_SOF_AMD_COMMON); + int acp_sof_ipc_get_mailbox_offset(struct snd_sof_dev *sdev) { const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index dd3c072d0172..1529c6d9bf9b 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -138,6 +138,7 @@ struct acp_dsp_stream { int stream_tag; int active; unsigned int reg_offset; + size_t posn_offset; }; struct sof_amd_acp_desc { @@ -199,6 +200,9 @@ int acp_dsp_block_read(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_ty irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context); int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, void *p, size_t sz); +int acp_set_stream_data_offset(struct snd_sof_dev *sdev, + struct snd_pcm_substream *substream, + size_t posn_offset); int acp_sof_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg); int acp_sof_ipc_get_mailbox_offset(struct snd_sof_dev *sdev); -- 2.25.1

1 3

[PATCH] ASoC: fsl_sai: Enable transmitter when generating MCLK
by Marek Vasut 15 Nov '22

15 Nov '22

For SAI to generate MCLK on external SoC pad, the transmitter must be enabled as well. With transmitter disabled, no clock are generated. Enable the transmitter using the TERE bit. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> To: alsa-devel(a)alsa-project.org --- sound/soc/fsl/fsl_sai.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 1c9be8a5dcb13..98c62027e5799 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -503,6 +503,10 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) /* SAI is in master mode at this point, so enable MCLK */ regmap_update_bits(sai->regmap, FSL_SAI_MCTL, FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + + /* Transmitter must be enabled to generate MCLK on pad */ + regmap_update_bits(sai->regmap, FSL_SAI_xCSR(1, ofs), + FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); } return 0; @@ -1445,6 +1449,11 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->soc_data->max_register >= FSL_SAI_MCTL) { regmap_update_bits(sai->regmap, FSL_SAI_MCTL, FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + + /* Transmitter must be enabled to generate MCLK on pad */ + regmap_update_bits(sai->regmap, + FSL_SAI_xCSR(1, sai->soc_data->reg_offset), + FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); } ret = pm_runtime_put_sync(dev); -- 2.35.1

2 6

ucm2: [Digidesign MBox3] Added default SplitPCMPeriodTime and reordered
by GitHub pull_request - opened 15 Nov '22

15 Nov '22

alsa-project/alsa-ucm-conf pull request #240 was opened from ManuLinares: Added default SplitPCMPeriodTime of 500 (0.5ms): to solve latency issues https://github.com/alsa-project/alsa-ucm-conf/issues/238 Reordered configs: to make pulseaudio select the correct default card profile, input and ourputs (pavucontrol) Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/240 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/240.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/14] ARM: remove unused davinci board & drivers
by Arnd Bergmann 14 Nov '22

14 Nov '22

From: Arnd Bergmann <arnd(a)arndb.de> As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused. In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away. As with the previous series, I can keep patches together in the soc tree, or subsystem maintainers can pick them up individually through their subsystems, whichever they prefer. Arnd Bergmann (14): ARM: davinci: remove unused board support ARM: davinci: drop DAVINCI_DMxxx references ARM: davinci: clean up platform support clk: remove davinci dm3xx drivers usb: musb: remove unused davinci support mfd: remove dm355evm_msp driver input: remove davinci keyboard driver rtc: remove davinci rtc driver ASoC: remove unused davinci support mfd: remove davinci voicecodec driver pata: remove palmchip bk3710 driver irqchip: remove davinci aintc driver staging: media: remove davinci vpfe_capture driver media: davinci: remove vpbe support Cc: Sekhar Nori <nsekhar(a)ti.com> Cc: Bartosz Golaszewski <brgl(a)bgdev.pl> Cc: Russell King <linux(a)armlinux.org.uk> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Damien Le Moal <damien.lemoal(a)opensource.wdc.com> Cc: Sergey Shtylyov <s.shtylyov(a)omp.ru> Cc: David Lechner <david(a)lechnology.com> Cc: Michael Turquette <mturquette(a)baylibre.com> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Marc Zyngier <maz(a)kernel.org> Cc: "Lad, Prabhakar" <prabhakar.csengg(a)gmail.com> Cc: Lee Jones <lee(a)kernel.org> Cc: Alessandro Zummo <a.zummo(a)towertech.it> Cc: Alexandre Belloni <alexandre.belloni(a)bootlin.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Bin Liu <b-liu(a)ti.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> 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: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Cc: Yang Yingliang <yangyingliang(a)huawei.com> Cc: linux-media(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-ide(a)vger.kernel.org Cc: linux-clk(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-rtc(a)vger.kernel.org Cc: linux-staging(a)lists.linux.dev Cc: linux-usb(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org .../admin-guide/media/davinci-vpbe.rst | 65 - .../admin-guide/media/platform-cardlist.rst | 1 - .../admin-guide/media/v4l-drivers.rst | 1 - .../media/drivers/davinci-vpbe-devel.rst | 39 - .../driver-api/media/drivers/index.rst | 1 - MAINTAINERS | 1 - arch/arm/Kconfig.debug | 16 +- arch/arm/mach-davinci/Kconfig | 142 -- arch/arm/mach-davinci/Makefile | 18 +- arch/arm/mach-davinci/board-da830-evm.c | 690 ------ arch/arm/mach-davinci/board-da850-evm.c | 1550 -------------- arch/arm/mach-davinci/board-dm355-evm.c | 444 ---- arch/arm/mach-davinci/board-dm355-leopard.c | 278 --- arch/arm/mach-davinci/board-dm365-evm.c | 855 -------- arch/arm/mach-davinci/board-mityomapl138.c | 638 ------ arch/arm/mach-davinci/board-omapl138-hawk.c | 451 ---- arch/arm/mach-davinci/common.h | 7 +- arch/arm/mach-davinci/cputype.h | 53 - arch/arm/mach-davinci/da830.c | 274 --- arch/arm/mach-davinci/da850.c | 400 +--- arch/arm/mach-davinci/da8xx.h | 95 +- arch/arm/mach-davinci/davinci.h | 136 -- arch/arm/mach-davinci/devices-da8xx.c | 1094 ---------- arch/arm/mach-davinci/devices.c | 303 --- arch/arm/mach-davinci/dm355.c | 832 ------- arch/arm/mach-davinci/dm365.c | 1094 ---------- arch/arm/mach-davinci/mux.c | 15 - arch/arm/mach-davinci/serial.c | 92 - arch/arm/mach-davinci/serial.h | 15 - arch/arm/mach-davinci/usb-da8xx.c | 146 -- arch/arm/mach-davinci/usb.c | 87 - drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 ---- drivers/clk/davinci/Makefile | 4 - drivers/clk/davinci/pll-dm355.c | 77 - drivers/clk/davinci/pll-dm365.c | 146 -- drivers/clk/davinci/pll.c | 8 - drivers/clk/davinci/pll.h | 5 - drivers/clk/davinci/psc-dm355.c | 89 - drivers/clk/davinci/psc-dm365.c | 111 - drivers/clk/davinci/psc.c | 6 - drivers/clk/davinci/psc.h | 7 - drivers/input/keyboard/Kconfig | 10 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/davinci_keyscan.c | 315 --- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --- drivers/irqchip/Kconfig | 5 - drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-davinci-aintc.c | 163 -- drivers/media/platform/ti/davinci/Kconfig | 16 - drivers/media/platform/ti/davinci/Makefile | 3 - drivers/media/platform/ti/davinci/vpbe.c | 840 -------- .../media/platform/ti/davinci/vpbe_display.c | 1510 ------------- drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 -------------- .../media/platform/ti/davinci/vpbe_osd_regs.h | 352 --- drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------ .../platform/ti/davinci/vpbe_venc_regs.h | 165 -- drivers/media/platform/ti/davinci/vpss.c | 529 ----- drivers/mfd/Kconfig | 13 - drivers/mfd/Makefile | 3 - drivers/mfd/davinci_voicecodec.c | 136 -- drivers/mfd/dm355evm_msp.c | 454 ---- drivers/rtc/Kconfig | 16 - drivers/rtc/Makefile | 2 - drivers/rtc/rtc-davinci.c | 512 ----- drivers/rtc/rtc-dm355evm.c | 151 -- drivers/staging/media/Kconfig | 1 - drivers/staging/media/Makefile | 1 - .../media/deprecated/vpfe_capture/Kconfig | 58 - .../media/deprecated/vpfe_capture/Makefile | 4 - .../media/deprecated/vpfe_capture/TODO | 7 - .../deprecated/vpfe_capture/ccdc_hw_device.h | 80 - .../deprecated/vpfe_capture/dm355_ccdc.c | 934 -------- .../deprecated/vpfe_capture/dm355_ccdc.h | 308 --- .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- .../deprecated/vpfe_capture/dm644x_ccdc.c | 879 -------- .../deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- .../vpfe_capture/dm644x_ccdc_regs.h | 140 -- .../media/deprecated/vpfe_capture/isif.c | 1127 ---------- .../media/deprecated/vpfe_capture/isif.h | 518 ----- .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- .../deprecated/vpfe_capture/vpfe_capture.c | 1902 ----------------- drivers/usb/musb/Kconfig | 12 - drivers/usb/musb/Makefile | 2 - drivers/usb/musb/cppi_dma.c | 1547 -------------- drivers/usb/musb/davinci.c | 606 ------ drivers/usb/musb/davinci.h | 103 - include/linux/clk/davinci.h | 9 - include/linux/mfd/dm355evm_msp.h | 79 - include/media/davinci/vpbe.h | 184 -- include/media/davinci/vpbe_display.h | 122 -- include/media/davinci/vpbe_osd.h | 382 ---- include/media/davinci/vpbe_types.h | 74 - include/media/davinci/vpbe_venc.h | 37 - include/media/davinci/vpfe_capture.h | 177 -- include/media/davinci/vpss.h | 111 - sound/soc/ti/Kconfig | 40 - sound/soc/ti/Makefile | 2 - sound/soc/ti/davinci-evm.c | 267 +-- sound/soc/ti/davinci-vcif.c | 247 --- 103 files changed, 17 insertions(+), 29049 deletions(-) delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c delete mode 100644 arch/arm/mach-davinci/davinci.h delete mode 100644 arch/arm/mach-davinci/devices.c delete mode 100644 arch/arm/mach-davinci/dm355.c delete mode 100644 arch/arm/mach-davinci/dm365.c delete mode 100644 arch/arm/mach-davinci/serial.c delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c delete mode 100644 arch/arm/mach-davinci/usb.c delete mode 100644 drivers/ata/pata_bk3710.c delete mode 100644 drivers/clk/davinci/pll-dm355.c delete mode 100644 drivers/clk/davinci/pll-dm365.c delete mode 100644 drivers/clk/davinci/psc-dm355.c delete mode 100644 drivers/clk/davinci/psc-dm365.c delete mode 100644 drivers/input/keyboard/davinci_keyscan.c delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/irqchip/irq-davinci-aintc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpss.c delete mode 100644 drivers/mfd/davinci_voicecodec.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-davinci.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c delete mode 100644 drivers/usb/musb/cppi_dma.c delete mode 100644 drivers/usb/musb/davinci.c delete mode 100644 drivers/usb/musb/davinci.h delete mode 100644 include/linux/mfd/dm355evm_msp.h delete mode 100644 include/media/davinci/vpbe.h delete mode 100644 include/media/davinci/vpbe_display.h delete mode 100644 include/media/davinci/vpbe_osd.h delete mode 100644 include/media/davinci/vpbe_types.h delete mode 100644 include/media/davinci/vpbe_venc.h delete mode 100644 include/media/davinci/vpfe_capture.h delete mode 100644 include/media/davinci/vpss.h delete mode 100644 sound/soc/ti/davinci-vcif.c -- 2.29.2

5 5

Re: regression with SG DMA buf allocations and IOMMU in low-mem
by Kai Vehmanen 14 Nov '22

14 Nov '22

Hi, On Fri, 4 Nov 2022, Takashi Iwai wrote: > On Fri, 04 Nov 2022 15:56:50 +0100, Kai Vehmanen wrote: > > Looking at 5.15 code, the fallback looks very different, but > > in fallback we still use the DMA mapping API via snd_dma_dev_alloc() > > so even if we go to fallback path, mapping is still ok. > > > > Any ideas which way this should be fixed? Given the many changes > > I thought it's better to ask early on the list about this. > > Hrm, that's a tough issue. Basically if dma_alloc_noncontiguous() > fails, it's really out of memory -- at least under the situation where > IOMMU is enabled. The fallback path was introduced for the case where > there is no IOMMU and noncontiguous allocation fails from the > beginning. follow-up to this problem. It turns out there was additional problem with dma_alloc_noncontiguous that led to ENOMEM much more frequently than in the past. This required following: - your rework in 5.16 to sound/core/memalloc.c for x86 DMA SG - IOMMU/DMAR enabled for the device - CONFIG_DMA_REMAP=n (default 'n' on most/all x86 systems before 5.18) ... with above combination, iommu_dma_ops in drivers/iommu/dma-iommu.c were not defined for noncontiguous alloc/free, so the dma_alloc_noncontiguous() in the end went back to plain dma_common_alloc_pages() (single contiguous alloc), which would fail very easily when system was in low-mem condition. In 5.18, this patch was added commit f5ff79fddf0efecca538046b5cc20fb3ded2ec4f Author: Christoph Hellwig <hch(a)lst.de> Date: Sat Feb 26 16:40:21 2022 +0100 dma-mapping: remove CONFIG_DMA_REMAP ... and this basicly fixes the issue again, even when IOMMU is enabled. Br, Kai

1 0

[PATCH] ALSA: memalloc: Allocate more contiguous pages for fallback case
by Takashi Iwai 14 Nov '22

14 Nov '22

Currently the fallback SG allocation tries to allocate each single page, and this tends to result in the reverse order of memory addresses when large space is available at boot, as the kernel takes a free page from the top to the bottom in the zone. The end result looks as if non-contiguous (although it actually is). What's worth is that it leads to an overflow of BDL entries for HD-audio. For avoiding such a problem, this patch modifies the allocation code slightly; now it tries to allocate the larger contiguous chunks as much as possible, then reduces to the smaller chunks only if the allocation failed -- a similar strategy as the existing snd_dma_alloc_pages_fallback() function. Along with the trick, drop the unused address array from snd_dma_sg_fallback object. It was needed in the past when dma_alloc_coherent() was used, but with the standard page allocator, it became superfluous and never referred. Fixes: a8d302a0b770 ("ALSA: memalloc: Revive x86-specific WC page allocations again") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index ba095558b6d1..7268304009ad 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -720,7 +720,6 @@ static const struct snd_malloc_ops snd_dma_sg_wc_ops = { struct snd_dma_sg_fallback { size_t count; struct page **pages; - dma_addr_t *addrs; }; static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab, @@ -732,38 +731,49 @@ static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab, for (i = 0; i < sgbuf->count && sgbuf->pages[i]; i++) do_free_pages(page_address(sgbuf->pages[i]), PAGE_SIZE, wc); kvfree(sgbuf->pages); - kvfree(sgbuf->addrs); kfree(sgbuf); } static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size) { struct snd_dma_sg_fallback *sgbuf; - struct page **pages; - size_t i, count; + struct page **pagep, *curp; + size_t chunk, npages; + dma_addr_t addr; void *p; bool wc = dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK; sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL); if (!sgbuf) return NULL; - count = PAGE_ALIGN(size) >> PAGE_SHIFT; - pages = kvcalloc(count, sizeof(*pages), GFP_KERNEL); - if (!pages) - goto error; - sgbuf->pages = pages; - sgbuf->addrs = kvcalloc(count, sizeof(*sgbuf->addrs), GFP_KERNEL); - if (!sgbuf->addrs) + size = PAGE_ALIGN(size); + sgbuf->count = size >> PAGE_SHIFT; + sgbuf->pages = kvcalloc(sgbuf->count, sizeof(*sgbuf->pages), GFP_KERNEL); + if (!sgbuf->pages) goto error; - for (i = 0; i < count; sgbuf->count++, i++) { - p = do_alloc_pages(dmab->dev.dev, PAGE_SIZE, &sgbuf->addrs[i], wc); - if (!p) - goto error; - sgbuf->pages[i] = virt_to_page(p); + pagep = sgbuf->pages; + chunk = size; + while (size > 0) { + chunk = min(size, chunk); + p = do_alloc_pages(dmab->dev.dev, chunk, &addr, wc); + if (!p) { + if (chunk <= PAGE_SIZE) + goto error; + chunk >>= 1; + chunk = PAGE_SIZE << get_order(chunk); + continue; + } + + size -= chunk; + /* fill pages */ + npages = chunk >> PAGE_SHIFT; + curp = virt_to_page(p); + while (npages--) + *pagep++ = curp++; } - p = vmap(pages, count, VM_MAP, PAGE_KERNEL); + p = vmap(sgbuf->pages, sgbuf->count, VM_MAP, PAGE_KERNEL); if (!p) goto error; dmab->private_data = sgbuf; -- 2.35.3

2 1

[PATCH v2 0/2] ASoC: Intel: avs: DSP recovery and resume fixes
by Cezary Rojewski 14 Nov '22

14 Nov '22

Two fixes that are result of the recent discussions [1][2]. First adds missing locking around snd_pcm_stop() while the second fix sets substream state to DISCONNECTED if any suspend/resume related operation fails so that userspace has means to be aware that something went wrong during said operation. Changes in v2: - __snd_pcm_set_state() replaced direct assignments of PCM state [1]: https://lore.kernel.org/alsa-devel/73e6425f-8e51-e26f-ad83-ccc5df517a43@int… [2]: https://lore.kernel.org/alsa-devel/20221104131244.3920179-1-cezary.rojewski… Cezary Rojewski (2): ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails sound/soc/intel/avs/ipc.c | 2 ++ sound/soc/intel/avs/pcm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) -- 2.25.1

2 10

[PATCH v1] sound/pci/hda/patch_realtek: don't call alc_shutup_pins without a spec
by Daniil Tatianin 14 Nov '22

14 Nov '22

alc_shutup_pins always expects the spec to be present, so make sure it is before we call it. Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Daniil Tatianin <d-tatianin(a)yandex-team.ru> --- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 60e3bc124836..2cf4b64971d7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -939,10 +939,12 @@ static inline void alc_shutup(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; + if (!spec) + return; if (!snd_hda_get_bool_hint(codec, "shutup")) return; /* disabled explicitly by hints */ - if (spec && spec->shutup) + if (spec->shutup) spec->shutup(codec); else alc_shutup_pins(codec); -- 2.25.1

2 3

[PATCH] ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open()
by Takashi Iwai 12 Nov '22

12 Nov '22

snd_usbmidi_output_open() has a check of the NULL port with snd_BUG_ON(). snd_BUG_ON() was used as this shouldn't have happened, but in reality, the NULL port may be seen when the device gives an invalid endpoint setup at the descriptor, hence the driver skips the allocation. That is, the check itself is valid and snd_BUG_ON() should be dropped from there. Otherwise it's confusing as if it were a real bug, as recently syzbot stumbled on it. Reported-by: syzbot+9abda841d636d86c41da(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/syzbot+9abda841d636d86c41da@syzkaller.appspotmail… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/midi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/usb/midi.c b/sound/usb/midi.c index bbff0923d264..2839f6b6f09b 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1133,10 +1133,8 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream) port = &umidi->endpoints[i].out->ports[j]; break; } - if (!port) { - snd_BUG(); + if (!port) return -ENXIO; - } substream->runtime->private_data = port; port->state = STATE_UNKNOWN; -- 2.35.3

1 0

[syzbot] WARNING in snd_usbmidi_output_open
by syzbot 12 Nov '22

12 Nov '22

Hello, syzbot found the following issue on: HEAD commit: f8f60f322f06 Add linux-next specific files for 20221111 git tree: linux-next console+strace: https://syzkaller.appspot.com/x/log.txt?x=12fe828e880000 kernel config: https://syzkaller.appspot.com/x/.config?x=85ba52c07cd97289 dashboard link: https://syzkaller.appspot.com/bug?extid=9abda841d636d86c41da compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=160e91fa880000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=161d3e69880000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/6008df424195/disk-f8f60f32.raw… vmlinux: https://storage.googleapis.com/syzbot-assets/394340525f66/vmlinux-f8f60f32.… kernel image: https://storage.googleapis.com/syzbot-assets/b13604a3343a/bzImage-f8f60f32.… IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+9abda841d636d86c41da(a)syzkaller.appspotmail.com ------------[ cut here ]------------ BUG? WARNING: CPU: 0 PID: 5267 at sound/usb/midi.c:1137 snd_usbmidi_output_open+0xd8/0x410 sound/usb/midi.c:1137 Modules linked in: CPU: 0 PID: 5267 Comm: syz-executor895 Not tainted 6.1.0-rc4-next-20221111-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:snd_usbmidi_output_open+0xd8/0x410 sound/usb/midi.c:1137 Code: 3c 02 00 0f 85 03 03 00 00 4d 8b be 10 02 00 00 4d 85 ff 0f 85 c8 00 00 00 e8 d4 92 25 fa 48 c7 c7 a0 6e f2 8a e8 02 da 04 02 <0f> 0b 41 bc fa ff ff ff e8 bb 92 25 fa 44 89 e0 48 83 c4 08 5b 5d RSP: 0018:ffffc90003b7f3a0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff888146c8d000 RCX: 0000000000000000 RDX: ffff8880245d3a80 RSI: ffffffff81624e68 RDI: fffff5200076fe66 RBP: ffff88801ed9c900 R08: 0000000000000005 R09: 0000000000000000 R10: 0000000080000000 R11: 0000000000000000 R12: ffff88814017cc00 R13: 0000000000000000 R14: ffff88802b1d5000 R15: 0000000000000000 FS: 00005555574d4300(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6ed57c3670 CR3: 0000000076149000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> open_substream+0x41d/0x8c0 sound/core/rawmidi.c:344 rawmidi_open_priv+0x591/0x6f0 sound/core/rawmidi.c:394 snd_rawmidi_kernel_open+0x1b5/0x270 sound/core/rawmidi.c:429 midisynth_use+0xee/0x270 sound/core/seq/seq_midi.c:215 subscribe_port sound/core/seq/seq_ports.c:412 [inline] check_and_subscribe_port+0x89a/0xb80 sound/core/seq/seq_ports.c:495 snd_seq_port_connect+0x382/0x540 sound/core/seq/seq_ports.c:581 snd_seq_ioctl_subscribe_port+0x1fc/0x400 sound/core/seq/seq_clientmgr.c:1490 snd_seq_kernel_client_ctl+0x102/0x1c0 sound/core/seq/seq_clientmgr.c:2367 snd_seq_oss_midi_open+0x582/0x6e0 sound/core/seq/oss/seq_oss_midi.c:361 snd_seq_oss_synth_setup_midi+0x12d/0x530 sound/core/seq/oss/seq_oss_synth.c:269 snd_seq_oss_open+0x8b8/0xa70 sound/core/seq/oss/seq_oss_init.c:260 odev_open+0x6c/0x90 sound/core/seq/oss/seq_oss.c:128 soundcore_open+0x44e/0x620 sound/sound_core.c:593 chrdev_open+0x266/0x770 fs/char_dev.c:414 do_dentry_open+0x6cc/0x13f0 fs/open.c:882 do_open fs/namei.c:3557 [inline] path_openat+0x1bbc/0x2a50 fs/namei.c:3713 do_filp_open+0x1b6/0x400 fs/namei.c:3740 do_sys_openat2+0x16d/0x4c0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_openat fs/open.c:1342 [inline] __se_sys_openat fs/open.c:1337 [inline] __x64_sys_openat+0x13f/0x1f0 fs/open.c:1337 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f496367ae39 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 14 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc99e01aa8 EFLAGS: 00000246 ORIG_RAX: 0000000000000101 RAX: ffffffffffffffda RBX: 00000000000f4240 RCX: 00007f496367ae39 RDX: 0000000000020983 RSI: 0000000020000080 RDI: ffffffffffffff9c RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000d066 R13: 00007ffc99e01abc R14: 00007ffc99e01ad0 R15: 00007ffc99e01ac0 </TASK> --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

3 3