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

[PATCH] ASoC: amd: acp: Fix possible UAF in acp_dma_open
by Gaosheng Cui 18 Nov '22

18 Nov '22

Smatch report warning as follows: sound/soc/amd/acp/acp-platform.c:199 acp_dma_open() warn: '&stream->list' not removed from list If snd_pcm_hw_constraint_integer() fails in acp_dma_open(), stream will be freed, but stream->list will not be removed from adata->stream_list, then list traversal may cause UAF. Fix by removeing it from adata->stream_list before free(). Fixes: 7929985cfe36 ("ASoC: amd: acp: Initialize list to store acp_stream during pcm_open") Signed-off-by: Gaosheng Cui <cuigaosheng1(a)huawei.com> --- sound/soc/amd/acp/acp-platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c index 85a81add4ef9..275e0428eec4 100644 --- a/sound/soc/amd/acp/acp-platform.c +++ b/sound/soc/amd/acp/acp-platform.c @@ -196,6 +196,9 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); if (ret < 0) { dev_err(component->dev, "set integer constraint failed\n"); + spin_lock_irq(&adata->acp_lock); + list_del(&stream->list); + spin_unlock_irq(&adata->acp_lock); kfree(stream); return ret; } -- 2.25.1

3 2

Revert "ucm2: add profile for the Librem 5"
by GitHub pull_request - opened 17 Nov '22

17 Nov '22

alsa-project/alsa-ucm-conf pull request #243 was opened from craftyguy: This reverts commit 998849d9510754960d808e20dad4c440adaf87ef. The oem (Purism) is working on some big improvements to this config, which I knew of when I submitted the patch this reverts, however I didn't realize until now that their changes would break config. It's probably best to just revert this so it doesn't make it into a release and wait for the oem to submit their improved ucm upstream. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/243 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/243.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 0/4] Minor SoundWire clean ups
by Charles Keepax 17 Nov '22

17 Nov '22

Just some minor tidy ups and preparation for starting to upstream some Cirrus SoundWire devices. The first three patches are pretty trivial, the last patch which moves the remaining core over to using the no_pm functions could probably use some careful review. Changes since v1: - Update commit message on the debugfs to more explicitly mention the PM runtime reference, rather than implying the PM would turn on/off each time. - Added some reviewed by's Thanks, Charles Charles Keepax (3): soundwire: Provide build stubs for common functions soundwire: debugfs: Switch to sdw_read_no_pm soundwire: stream: Move remaining register accesses over to no_pm Simon Trimmer (1): soundwire: bus: export sdw_nwrite_no_pm and sdw_nread_no_pm functions drivers/soundwire/bus.c | 10 ++-- drivers/soundwire/debugfs.c | 11 +++- drivers/soundwire/stream.c | 30 +++++------ include/linux/soundwire/sdw.h | 94 +++++++++++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 31 deletions(-) -- 2.30.2

2 6

[PATCH 1/2] ASoC: codecs: wsa883x: Shutdown on error path
by Krzysztof Kozlowski 17 Nov '22

17 Nov '22

If probe fails, toggle shutdown via GPIO to save power and reverse probe actions. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/wsa883x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index 77a7dd3cf495..4ad8b875eb8f 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -1415,6 +1415,7 @@ static int wsa883x_probe(struct sdw_slave *pdev, wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config); if (IS_ERR(wsa883x->regmap)) { + gpiod_direction_output(wsa883x->sd_n, 1); dev_err(&pdev->dev, "regmap_init failed\n"); ret = PTR_ERR(wsa883x->regmap); goto err; -- 2.34.1

2 2

[PATCH 0/4] ADD SOF support for rembrandt platform
by V sujith kumar Reddy 17 Nov '22

17 Nov '22

This series consists of 1.Make ACP core code generic for newer SOC transition 2.Add support for Rembrandt plaform 3.Adding amd HS functionality to the sof core 4.increase SRAM inbox and outbox size to 1024 Ajit Kumar Pandey (1): ASoC: SOF: amd: Make ACP core code generic for newer SOC transition V sujith kumar Reddy (3): ASoC: SOF: amd: Add support for Rembrandt plaform. ASoC: SOF: Adding amd HS functionality to the sof core ASoC: SOF: amd: increase SRAM inbox and outbox size to 1024 include/sound/sof/dai.h | 2 + sound/soc/sof/amd/Kconfig | 10 ++ sound/soc/sof/amd/Makefile | 4 +- sound/soc/sof/amd/acp-common.c | 111 +++++++++++++++++ sound/soc/sof/amd/acp-dsp-offset.h | 33 +++-- sound/soc/sof/amd/acp-ipc.c | 49 ++++++-- sound/soc/sof/amd/acp-loader.c | 20 +++- sound/soc/sof/amd/acp-pcm.c | 3 +- sound/soc/sof/amd/acp-stream.c | 7 +- sound/soc/sof/amd/acp.c | 52 +++++--- sound/soc/sof/amd/acp.h | 38 ++++-- sound/soc/sof/amd/pci-rmb.c | 186 +++++++++++++++++++++++++++++ sound/soc/sof/amd/pci-rn.c | 11 ++ sound/soc/sof/amd/rembrandt.c | 134 +++++++++++++++++++++ sound/soc/sof/amd/renoir.c | 101 ++-------------- sound/soc/sof/ipc3-pcm.c | 9 ++ sound/soc/sof/ipc3-topology.c | 33 +++++ sound/soc/sof/topology.c | 1 + 18 files changed, 653 insertions(+), 151 deletions(-) create mode 100644 sound/soc/sof/amd/acp-common.c create mode 100644 sound/soc/sof/amd/pci-rmb.c create mode 100644 sound/soc/sof/amd/rembrandt.c -- 2.25.1

5 12

[PATCH linux-next] slimbus: core: Use device_match_of_node()
by ye.xingchen＠zte.com.cn 17 Nov '22

17 Nov '22

From: ye xingchen <ye.xingchen(a)zte.com.cn> Replace the open-code with device_match_of_node(). Signed-off-by: ye xingchen <ye.xingchen(a)zte.com.cn> --- drivers/slimbus/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 219483b79c09..9cafd33e7ddb 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -389,7 +389,7 @@ static int of_slim_match_dev(struct device *dev, void *data) struct device_node *np = data; struct slim_device *sbdev = to_slim_device(dev); - return (sbdev->dev.of_node == np); + return device_match_of_node(&sbdev->dev, np); } static struct slim_device *of_find_slim_device(struct slim_controller *ctrl, -- 2.25.1

1 0

[PATCH] ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions
by shumingf＠realtek.com 17 Nov '22

17 Nov '22

From: Shuming Fan <shumingf(a)realtek.com> Due to the hardware behavior, it takes some time for CBJ detection/impedance sensing/de-bounce. The ClockStop_NotFinished flag will be raised until these functions are completed. In ClockStopMode0 mode case, the SdW controller might check this flag from D3 to D0 when the jack detection interrupt happened. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt711-sdca-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index 4120842fe699..88a8392a58ed 100644 --- a/sound/soc/codecs/rt711-sdca-sdw.c +++ b/sound/soc/codecs/rt711-sdca-sdw.c @@ -230,7 +230,7 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) } /* set the timeout values */ - prop->clk_stop_timeout = 20; + prop->clk_stop_timeout = 700; /* wake-up event */ prop->wake_capable = 1; -- 2.38.1

4 3

[PATCH 0/2] ASoC: Add a driver for the Iron Device SMA1303 Amp
by Kiseok Jo 16 Nov '22

16 Nov '22

This adds basic audio support for the Iron Device SMA1303 amplifier. Kiseok Jo (2): ASoC: sma1303: Add driver for Iron Device SMA1303 Amp ASoC: dt-bindings: sma1303: Iron Device SMA1303 Amp .../bindings/sound/irondevice,sma1303.yaml | 40 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sma1303.c | 2119 +++++++++++++++++ sound/soc/codecs/sma1303.h | 609 +++++ 6 files changed, 2779 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml create mode 100644 sound/soc/codecs/sma1303.c create mode 100644 sound/soc/codecs/sma1303.h -- 2.30.2

4 5

[PATCH 1/2] ASoC: amd: ps: update macros with ps platform naming convention
by Syed Saba Kareem 16 Nov '22

16 Nov '22

Update macros using ps platform naming convention. Signed-off-by: Syed Saba Kareem <Syed.SabaKareem(a)amd.com> --- sound/soc/amd/ps/acp63.h | 8 ++++---- sound/soc/amd/ps/pci-ps.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h index 85f869c2229f..a90ba3b20dc7 100644 --- a/sound/soc/amd/ps/acp63.h +++ b/sound/soc/amd/ps/acp63.h @@ -8,10 +8,10 @@ #include <sound/acp63_chip_offset_byte.h> #define ACP_DEVICE_ID 0x15E2 -#define ACP6x_REG_START 0x1240000 -#define ACP6x_REG_END 0x1250200 -#define ACP6x_DEVS 3 -#define ACP6x_PDM_MODE 1 +#define ACP63_REG_START 0x1240000 +#define ACP63_REG_END 0x1250200 +#define ACP63_DEVS 3 +#define ACP63_PDM_MODE 1 #define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001 #define ACP_PGFSM_CNTL_POWER_ON_MASK 1 diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index 08c4b9bef055..98dddd1a0cf4 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -21,7 +21,7 @@ struct acp63_dev_data { void __iomem *acp63_base; struct resource *res; bool acp63_audio_mode; - struct platform_device *pdev[ACP6x_DEVS]; + struct platform_device *pdev[ACP63_DEVS]; }; static int acp63_power_on(void __iomem *acp_base) @@ -143,7 +143,7 @@ static int snd_acp63_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { struct acp63_dev_data *adata; - struct platform_device_info pdevinfo[ACP6x_DEVS]; + struct platform_device_info pdevinfo[ACP63_DEVS]; int index, ret; int val = 0x00; struct acpi_device *adev; @@ -219,8 +219,8 @@ static int snd_acp63_probe(struct pci_dev *pci, adata->res->name = "acp_iomem"; adata->res->flags = IORESOURCE_MEM; adata->res->start = addr; - adata->res->end = addr + (ACP6x_REG_END - ACP6x_REG_START); - adata->acp63_audio_mode = ACP6x_PDM_MODE; + adata->res->end = addr + (ACP63_REG_END - ACP63_REG_START); + adata->acp63_audio_mode = ACP63_PDM_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo[0].name = "acp_ps_pdm_dma"; @@ -237,7 +237,7 @@ static int snd_acp63_probe(struct pci_dev *pci, pdevinfo[2].id = 0; pdevinfo[2].parent = &pci->dev; - for (index = 0; index < ACP6x_DEVS; index++) { + for (index = 0; index < ACP63_DEVS; index++) { adata->pdev[index] = platform_device_register_full(&pdevinfo[index]); @@ -312,8 +312,8 @@ static void snd_acp63_remove(struct pci_dev *pci) int ret, index; adata = pci_get_drvdata(pci); - if (adata->acp63_audio_mode == ACP6x_PDM_MODE) { - for (index = 0; index < ACP6x_DEVS; index++) + if (adata->acp63_audio_mode == ACP63_PDM_MODE) { + for (index = 0; index < ACP63_DEVS; index++) platform_device_unregister(adata->pdev[index]); } ret = acp63_deinit(adata->acp63_base, &pci->dev); -- 2.25.1

2 2

[PATCH] ASoC: max98373: Add checks for devm_kcalloc
by Jiasheng Jiang 16 Nov '22

16 Nov '22

As the devm_kcalloc may return NULL pointer, it should be better to check the return value in order to avoid NULL poineter dereference. Fixes: 349dd23931d1 ("ASoC: max98373: don't access volatile registers in bias level off") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/max98373-i2c.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/max98373-i2c.c b/sound/soc/codecs/max98373-i2c.c index 3e04c7f0cce4..ec0905df65d1 100644 --- a/sound/soc/codecs/max98373-i2c.c +++ b/sound/soc/codecs/max98373-i2c.c @@ -549,6 +549,10 @@ static int max98373_i2c_probe(struct i2c_client *i2c) max98373->cache = devm_kcalloc(&i2c->dev, max98373->cache_num, sizeof(*max98373->cache), GFP_KERNEL); + if (!max98373->cache) { + ret = -ENOMEM; + return ret; + } for (i = 0; i < max98373->cache_num; i++) max98373->cache[i].reg = max98373_i2c_cache_reg[i]; -- 2.25.1

2 1