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

Re: [PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy
by Pierre-Louis Bossart 17 Mar '22

17 Mar '22

On 3/17/22 04:38, Yihao Han wrote: > fix memdup.cocci warning: > sound/soc/sof/topology.c:876:19-26: WARNING opportunity for kmemdup > > Generated by: scripts/coccinelle/api/memdup.cocci > > Signed-off-by: Yihao Han <hanyihao(a)vivo.com> Thanks for the patch Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > --- > sound/soc/sof/topology.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c > index 367fbe2d5b31..369693cc6d10 100644 > --- a/sound/soc/sof/topology.c > +++ b/sound/soc/sof/topology.c > @@ -873,11 +873,10 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp, > > /* copy the private data */ > if (priv_size > 0) { > - scontrol->priv = kzalloc(priv_size, GFP_KERNEL); > + scontrol->priv = kmemdup(control->priv.data, priv_size, GFP_KERNEL); > if (!scontrol->priv) > return -ENOMEM; > > - memcpy(scontrol->priv, control->priv.data, priv_size); > scontrol->priv_size = priv_size; > } >

1 0

Re: [PATCH 10/19] dma: imx-sdma: Add multi fifo support
by Sascha Hauer 17 Mar '22

17 Mar '22

On Thu, Mar 17, 2022 at 05:08:55PM +0800, Shengjiu Wang wrote: > On Thu, Mar 17, 2022 at 4:28 PM Sascha Hauer <[1]s.hauer(a)pengutronix.de> > wrote: > > +struct sdma_peripheral_config { > + int n_fifos_src; > + int n_fifos_dst; > + bool sw_done; > +}; > + > #endif > > Hi Sascha > This is our internal definition for this sdma_peripheral_config. > Could you please adopt this? This structure is completely internal to the kernel and can be adjusted when we need it. I don't see a reason to add unused fields to it just to be compatible with a downstream kernel. Sascha > /** > * struct sdma_audio_config - special sdma config for audio case > * @src_fifo_num: source fifo number for mcu_2_sai/sai_2_mcu script > * For example, if there are 4 fifos, sdma will fetch > * fifos one by one and roll back to the first fifo after > * the 4th fifo fetch. > * @dst_fifo_num: similar as src_fifo_num, but dest fifo instead. > * @src_fifo_off: source fifo offset, 0 means all fifos are continuous, 1 > * means 1 word offset between fifos. All offset between > * fifos should be same. > * @dst_fifo_off: dst fifo offset, similar as @src_fifo_off. > * @words_per_fifo: numbers of words per fifo fetch/fill, 0 means > * one channel per fifo, 1 means 2 channels per fifo.. > * If 'src_fifo_num = 4' and 'chans_per_fifo = 1', it > * means the first two words(channels) fetch from fifo1 > * and then jump to fifo2 for next two words, and so on > * after the last fifo4 fetched, roll back to fifo1. > * @sw_done_sel: software done selector, PDM need enable software done > feature > * in mcu_2_sai/sai_2_mcu script. > * Bit31: sw_done eanbled or not > * Bit16~Bit0: selector > * For example: 0x80000000 means sw_done enabled for done0 > * sector which is for PDM on i.mx8mm. > */ > struct sdma_audio_config { > u8 src_fifo_num; > u8 dst_fifo_num; > u8 src_fifo_off; > u8 dst_fifo_off; > u8 words_per_fifo; > u32 sw_done_sel; > }; > best regards > wang shengjiu > > > References > > Visible links > 1. mailto:s.hauer@pengutronix.de > 2. mailto:s.hauer@pengutronix.de -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

1 0

RE: [PATCH 10/19] dma: imx-sdma: Add multi fifo support
by S.J. Wang 17 Mar '22

17 Mar '22

Hi Sascha > --- > drivers/dma/imx-sdma.c | 54 +++++++++++++++++++++++++++ > include/linux/platform_data/dma-imx.h | 7 ++++ > 2 files changed, 61 insertions(+) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index > 1038f6bc7f846..21e1cec2ffde9 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -14,6 +14,7 @@ > #include <linux/iopoll.h> > #include <linux/module.h> > #include <linux/types.h> > +#include <linux/bitfield.h> > #include <linux/bitops.h> > #include <linux/mm.h> > #include <linux/interrupt.h> > @@ -73,6 +74,7 @@ > #define SDMA_CHNENBL0_IMX35 0x200 > #define SDMA_CHNENBL0_IMX31 0x080 > #define SDMA_CHNPRI_0 0x100 > +#define SDMA_DONE0_CONFIG 0x1000 > > /* > * Buffer descriptor status values. > @@ -180,6 +182,12 @@ > BIT(DMA_MEM_TO_DEV) | \ > BIT(DMA_DEV_TO_DEV)) > > +#define SDMA_WATERMARK_LEVEL_N_FIFOS GENMASK(15, 12) > +#define SDMA_WATERMARK_LEVEL_SW_DONE BIT(23) > + > +#define SDMA_DONE0_CONFIG_DONE_SEL BIT(7) > +#define SDMA_DONE0_CONFIG_DONE_DIS BIT(6) > + > /** > * struct sdma_script_start_addrs - SDMA script start pointers > * > @@ -441,6 +449,11 @@ struct sdma_channel { > struct work_struct terminate_worker; > struct list_head terminated; > bool is_ram_script; > + unsigned int n_fifos; > + unsigned int n_fifos_src; > + unsigned int n_fifos_dst; > + bool sw_done; > + u32 sw_done_sel; > }; > > #define IMX_DMA_SG_LOOP BIT(0) > @@ -773,6 +786,14 @@ static void sdma_event_enable(struct > sdma_channel *sdmac, unsigned int event) > val = readl_relaxed(sdma->regs + chnenbl); > __set_bit(channel, &val); > writel_relaxed(val, sdma->regs + chnenbl); > + > + /* Set SDMA_DONEx_CONFIG is sw_done enabled */ > + if (sdmac->sw_done) { > + val = readl_relaxed(sdma->regs + SDMA_DONE0_CONFIG); > + val |= SDMA_DONE0_CONFIG_DONE_SEL; > + val &= ~SDMA_DONE0_CONFIG_DONE_DIS; > + writel_relaxed(val, sdma->regs + SDMA_DONE0_CONFIG); > + } > } > > static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int > event) @@ -1022,6 +1043,10 @@ static int sdma_get_pc(struct > sdma_channel *sdmac, > case IMX_DMATYPE_IPU_MEMORY: > emi_2_per = sdma->script_addrs->ext_mem_2_ipu_addr; > break; > + case IMX_DMATYPE_MULTI_SAI: > + per_2_emi = sdma->script_addrs->sai_2_mcu_addr; > + emi_2_per = sdma->script_addrs->mcu_2_sai_addr; > + break; > default: > dev_err(sdma->dev, "Unsupported transfer type %d\n", > peripheral_type); @@ -1198,6 +1223,15 @@ static void > sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) > sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_CONT; } > > +static void sdma_set_watermarklevel_for_sais(struct sdma_channel > +*sdmac) { > + if (sdmac->sw_done) > + sdmac->watermark_level |= > SDMA_WATERMARK_LEVEL_SW_DONE; > + > + sdmac->watermark_level |= > + FIELD_PREP(SDMA_WATERMARK_LEVEL_N_FIFOS, > +sdmac->n_fifos); } > + > static int sdma_config_channel(struct dma_chan *chan) { > struct sdma_channel *sdmac = to_sdma_chan(chan); @@ -1234,6 > +1268,10 @@ static int sdma_config_channel(struct dma_chan *chan) > sdmac->peripheral_type == IMX_DMATYPE_ASRC) > sdma_set_watermarklevel_for_p2p(sdmac); > } else { > + if (sdmac->peripheral_type == > + IMX_DMATYPE_MULTI_SAI) > + sdma_set_watermarklevel_for_sais(sdmac); > + > __set_bit(sdmac->event_id0, sdmac->event_mask); > } > > @@ -1669,6 +1707,7 @@ static int sdma_config_write(struct dma_chan > *chan, > sdmac->watermark_level = dmaengine_cfg->src_maxburst * > dmaengine_cfg->src_addr_width; > sdmac->word_size = dmaengine_cfg->src_addr_width; > + sdmac->n_fifos = sdmac->n_fifos_src; > } else if (direction == DMA_DEV_TO_DEV) { > sdmac->per_address2 = dmaengine_cfg->src_addr; > sdmac->per_address = dmaengine_cfg->dst_addr; @@ -1682,6 > +1721,7 @@ static int sdma_config_write(struct dma_chan *chan, > sdmac->watermark_level = dmaengine_cfg->dst_maxburst * > dmaengine_cfg->dst_addr_width; > sdmac->word_size = dmaengine_cfg->dst_addr_width; > + sdmac->n_fifos = sdmac->n_fifos_dst; > } > sdmac->direction = direction; > return sdma_config_channel(chan); @@ -1691,9 +1731,23 @@ static int > sdma_config(struct dma_chan *chan, > struct dma_slave_config *dmaengine_cfg) { > struct sdma_channel *sdmac = to_sdma_chan(chan); > + struct sdma_engine *sdma = sdmac->sdma; > > memcpy(&sdmac->slave_config, dmaengine_cfg, > sizeof(*dmaengine_cfg)); > > + if (dmaengine_cfg->peripheral_config) { > + struct sdma_peripheral_config *sdmacfg = dmaengine_cfg- > >peripheral_config; > + if (dmaengine_cfg->peripheral_size != sizeof(struct > sdma_peripheral_config)) { > + dev_err(sdma->dev, "Invalid peripheral size %zu, > expected %zu\n", > + dmaengine_cfg->peripheral_size, > + sizeof(struct sdma_peripheral_config)); > + return -EINVAL; > + } > + sdmac->n_fifos_src = sdmacfg->n_fifos_src; > + sdmac->n_fifos_dst = sdmacfg->n_fifos_dst; > + sdmac->sw_done = sdmacfg->sw_done; > + } > + > /* Set ENBLn earlier to make sure dma request triggered after that */ > if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events) > return -EINVAL; > diff --git a/include/linux/platform_data/dma-imx.h > b/include/linux/platform_data/dma-imx.h > index 281adbb26e6bd..4a43a048e1b4d 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -39,6 +39,7 @@ enum sdma_peripheral_type { > IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ > IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ > IMX_DMATYPE_SAI, /* SAI */ > + IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */ > }; > > enum imx_dma_prio { > @@ -65,4 +66,10 @@ static inline int imx_dma_is_general_purpose(struct > dma_chan *chan) > !strcmp(chan->device->dev->driver->name, "imx-dma"); } > > +struct sdma_peripheral_config { > + int n_fifos_src; > + int n_fifos_dst; > + bool sw_done; > +}; > + Seems there is issue with my gmail, I resend the comments again. This is our internal definition for this sdma_peripheral_config. Could you please adopt this? /** * struct sdma_audio_config - special sdma config for audio case * @src_fifo_num: source fifo number for mcu_2_sai/sai_2_mcu script * For example, if there are 4 fifos, sdma will fetch * fifos one by one and roll back to the first fifo after * the 4th fifo fetch. * @dst_fifo_num: similar as src_fifo_num, but dest fifo instead. * @src_fifo_off: source fifo offset, 0 means all fifos are continuous, 1 * means 1 word offset between fifos. All offset between * fifos should be same. * @dst_fifo_off: dst fifo offset, similar as @src_fifo_off. * @words_per_fifo: numbers of words per fifo fetch/fill, 0 means * one channel per fifo, 1 means 2 channels per fifo.. * If 'src_fifo_num = 4' and 'chans_per_fifo = 1', it * means the first two words(channels) fetch from fifo1 * and then jump to fifo2 for next two words, and so on * after the last fifo4 fetched, roll back to fifo1. * @sw_done_sel: software done selector, PDM need enable software done feature * in mcu_2_sai/sai_2_mcu script. * Bit31: sw_done eanbled or not * Bit16~Bit0: selector * For example: 0x80000000 means sw_done enabled for done0 * sector which is for PDM on i.mx8mm. */ struct sdma_audio_config { u8 src_fifo_num; u8 dst_fifo_num; u8 src_fifo_off; u8 dst_fifo_off; u8 words_per_fifo; u32 sw_done_sel; }; Best regards Wang shengjiu

1 0

[PATCH v2 0/5] ASoC: mediatek: Add support for MT8195 sound card with max98390 and rt5682
by Trevor Wu 17 Mar '22

17 Mar '22

This series of patches adds support for mt8195 board with mt6359, max98390 and rt5682. To prevent from copy-paste components, mt8195 machine drivers and dt-bindings are merged in the patch. Patches are based on broonie tree "for-next" branch. Changes since v1: - remove merged patches about reset controller - propose a common machine driver instead of machine driver common code - propose a common dt-bindings for mt8195 sound card Trevor Wu (5): ASoC: mediatek: mt8195: merge machine driver ASoC: dt-bindings: mediatek: mt8195: merge mt8195 machine yaml ASoC: mediatek: mt8195: rename card controls ASoC: mediatek: mt8195: add machine support for max98390 and rt5682 ASoC: dt-bindings: mediatek: mt8195: support mt8195-mt6359-max98390-rt5682 .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - ...-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- sound/soc/mediatek/Kconfig | 26 +- sound/soc/mediatek/mt8195/Makefile | 3 +- .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 ----------------- ...mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 984 +++++++++----- 6 files changed, 634 insertions(+), 1637 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (76%) -- 2.18.0

2 7

[PATCH 00/18] Introduce IPC abstraction for SOF topology parsing
by Ranjani Sridharan 16 Mar '22

16 Mar '22

This patchset makes the topology parsing layer in the SOF driver IPC-agnostic in preparation for supporting the new IPC version introduced in the SOF firmware. These patches purely contain abstraction changes for the current IPC version (IPC3) supported and do not introduce any functional changes. Ranjani Sridharan (18): ASoC: SOF: Introduce struct snd_sof_dai_link ASoC: SOF: IPC: Introduce IPC ops ASoC: SOF: topology: Add helper function for processing tuple arrays ASoC: SOF: Introduce IPC3 ops ASoC: SOF: topology: Make scheduler widget parsing IPC agnostic ASoC: SOF: topology: Make buffer widget parsing IPC agnostic ASoC: SOF: topology: Make pga widget parsing IPC agnostic ASoC: SOF: topology: Make mixer widget parsing IPC agnostic ASoC: SOF: topology: Make mux/demux widget parsing IPC agnostic ASoC: SOF: topology: Make src widget parsing IPC agnostic ASoC: SOF: topology: Make asrc widget parsing IPC agnostic ASoC: SOF: topology: Make siggen widget parsing IPC agnostic ASoC: SOF: topology: Make effect widget parsing IPC agnostic ASoC: SOF: topology: Make route setup IPC agnostic ASoC: SOF: topology: Make DAI widget parsing IPC agnostic ASoC: SOF: topology: Make control parsing IPC agnostic ASoC: SOF: topology: Make widget binding IPC agnostic ASoC: SOF: topology: remove snd_sof_complete_pipeline() sound/soc/sof/Makefile | 3 +- sound/soc/sof/control.c | 26 +- sound/soc/sof/core.c | 1 + sound/soc/sof/ipc.c | 14 +- sound/soc/sof/ipc3-topology.c | 2019 ++++++++++++++++++++++ sound/soc/sof/sof-audio.c | 66 +- sound/soc/sof/sof-audio.h | 135 +- sound/soc/sof/sof-priv.h | 16 + sound/soc/sof/topology.c | 3060 ++++++++------------------------- 9 files changed, 2941 insertions(+), 2399 deletions(-) create mode 100644 sound/soc/sof/ipc3-topology.c -- 2.25.1

2 21

[PATCH] ASoC: codecs: Fix misplaced lpass_macro_pds_exit call
by Srinivasa Rao Mandadapu 16 Mar '22

16 Mar '22

Update power domains exit function calling from runtime resume to remove function which was wrongly placed and causing crash in device suspend and resume. Fixes: 9e3d83c52844 ("ASoC: codecs: Add power domains support in digital macro codecs") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> --- sound/soc/codecs/lpass-tx-macro.c | 4 ++-- sound/soc/codecs/lpass-va-macro.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index b492d598..714a411 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1920,6 +1920,8 @@ static int tx_macro_remove(struct platform_device *pdev) clk_disable_unprepare(tx->npl); clk_disable_unprepare(tx->fsgen); + lpass_macro_pds_exit(tx->pds); + return 0; } @@ -1964,8 +1966,6 @@ static int __maybe_unused tx_macro_runtime_resume(struct device *dev) regcache_sync(tx->regmap); tx->reset_swr = true; - lpass_macro_pds_exit(tx->pds); - return 0; err_fsgen: clk_disable_unprepare(tx->npl); diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 300f4f6..f3cb596 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1503,6 +1503,8 @@ static int va_macro_remove(struct platform_device *pdev) clk_disable_unprepare(va->dcodec); clk_disable_unprepare(va->macro); + lpass_macro_pds_exit(va->pds); + return 0; } @@ -1532,8 +1534,6 @@ static int __maybe_unused va_macro_runtime_resume(struct device *dev) regcache_cache_only(va->regmap, false); regcache_sync(va->regmap); - lpass_macro_pds_exit(va->pds); - return 0; } -- 2.7.4

2 1

[PATCH] ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
by Miaoqian Lin 16 Mar '22

16 Mar '22

In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function. Fixes: de66b3455023 ("ASoC: codecs: msm8916-wcd-analog: add MBHC support") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/codecs/msm8916-wcd-analog.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 485cda46dbb9..e52a559c52d6 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -1222,8 +1222,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } irq = platform_get_irq_byname(pdev, "mbhc_switch_int"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_mbhc_switch_irq_handler, @@ -1235,8 +1237,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) if (priv->mbhc_btn_enabled) { irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_press_irq_handler, @@ -1247,8 +1251,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) dev_err(dev, "cannot request mbhc button press irq\n"); irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_release_irq_handler, @@ -1265,6 +1271,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) return devm_snd_soc_register_component(dev, &pm8916_wcd_analog, pm8916_wcd_analog_dai, ARRAY_SIZE(pm8916_wcd_analog_dai)); + +err_disable_clk: + clk_disable_unprepare(priv->mclk); + return ret; } static int pm8916_wcd_analog_spmi_remove(struct platform_device *pdev) -- 2.17.1

2 1

[PATCH] ASoC: amd: Fix reference to PCM buffer address
by Meng Tang 16 Mar '22

16 Mar '22

PCM buffers might be allocated dynamically when the buffer preallocation failed or a larger buffer is requested, and it's not guaranteed that substream->dma_buffer points to the actually used buffer. The driver needs to refer to substream->runtime->dma_addr instead for the buffer address. Fixes: cab396d8b22c1 ("ASoC: amd: add ACP5x pcm dma driver ops") Signed-off-by: Meng Tang <tangmeng(a)uniontech.com> --- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c index 31fa166df98a..d36bb718370f 100644 --- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c +++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c @@ -281,7 +281,7 @@ static int acp5x_dma_hw_params(struct snd_soc_component *component, return -EINVAL; } size = params_buffer_bytes(params); - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = substream->runtime->dma_addr; rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT); config_acp5x_dma(rtd, substream->stream); return 0; -- 2.20.1

2 1

[PATCH] ASoC: mediatek: mt8195: Fix error handling in mt8195_mt6359_rt1019_rt5682_dev_probe
by Miaoqian Lin 16 Mar '22

16 Mar '22

The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This function only calls of_node_put() in the regular path. And it will cause refcount leak in error path. Fixes: 082482a50227 ("ASoC: mediatek: mt8195: release device_node after snd_soc_register_card") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c index 29c2d3407cc7..e3146311722f 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c @@ -1342,7 +1342,8 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) "mediatek,dai-link"); if (ret) { dev_dbg(&pdev->dev, "Parse dai-link fail\n"); - return -EINVAL; + ret = -EINVAL; + goto put_node; } } else { if (!sof_on) @@ -1398,6 +1399,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, card); +put_node: of_node_put(platform_node); of_node_put(adsp_node); of_node_put(dp_node); -- 2.17.1

2 1

[PATCH] ASoC: codecs: wcd934x: Add missing of_node_put() in wcd934x_codec_parse_data
by Miaoqian Lin 16 Mar '22

16 Mar '22

The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This is similar to commit 64b92de9603f ("ASoC: wcd9335: fix a leaked reference by adding missing of_node_put") Fixes: a61f3b4f476e ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/codecs/wcd934x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 6c468527fec6..acd344c4a37a 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -5883,6 +5883,7 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) } wcd->sidev = of_slim_get_device(wcd->sdev->ctrl, ifc_dev_np); + of_node_put(ifc_dev_np); if (!wcd->sidev) { dev_err(dev, "Unable to get SLIM Interface device\n"); return -EINVAL; -- 2.17.1

2 1