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

[RESEND PATCH v3 0/2] ASoC/SoundWire: Intel: add sdw BE dai trigger
by Bard Liao 13 Jul '22

13 Jul '22

For SOF IPC4, we need to set pipeline state in BE DAI trigger. @Mark, resending this series in case it is lost in your mailbox. v2: - Change "#if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)" to "if (IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE))" v3: - Change the multi-line comment style in "soundwire: Intel: add trigger callback" patch and take Vinod's Ack. Bard Liao (2): soundwire: Intel: add trigger callback ASoC: SOF: Intel: add trigger callback into sdw_callback drivers/soundwire/intel.c | 9 +++++++++ include/linux/soundwire/sdw_intel.h | 1 + sound/soc/sof/intel/hda-dai.c | 14 +++++++++++--- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/intel/hda.h | 1 + 5 files changed, 23 insertions(+), 4 deletions(-) -- 2.17.1

2 3

[PATCH] soundwire: qcom: Update error prints to debug prints
by Srinivasa Rao Mandadapu 13 Jul '22

13 Jul '22

Upadte error prints to debug prints to avoid redundant logging in kernel boot time, as these prints are informative prints in irq handler. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- drivers/soundwire/qcom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 9df970e..a4293d0 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -573,11 +573,10 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) break; case SWRM_INTERRUPT_STATUS_NEW_SLAVE_ATTACHED: case SWRM_INTERRUPT_STATUS_CHANGE_ENUM_SLAVE_STATUS: - dev_err_ratelimited(swrm->dev, "%s: SWR new slave attached\n", - __func__); + dev_dbg(swrm->dev, "%s: SWR new slave attached\n", __func__); swrm->reg_read(swrm, SWRM_MCP_SLV_STATUS, &slave_status); if (swrm->slave_status == slave_status) { - dev_err(swrm->dev, "Slave status not changed %x\n", + dev_dbg(swrm->dev, "Slave status not changed %x\n", slave_status); } else { qcom_swrm_get_device_status(swrm); -- 2.7.4

4 6

[PATCH -next] ASoC: amd: fix Jadeite kconfig warning and build errors
by Randy Dunlap 13 Jul '22

13 Jul '22

Since SND_SOC_ES8316 has a hard dependency on I2C and since 'select' does not follow any dependency chains, SND_SOC_AMD_ST_ES8336_MACH also needs to have a hard dependency on I2C. Fixes a kconfig warning and subsequent build errors: WARNING: unmet direct dependencies detected for SND_SOC_ES8316 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n] Selected by [y]: - SND_SOC_AMD_ST_ES8336_MACH [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AMD_ACP [=y] && ACPI [=y] && (I2C [=n] || COMPILE_TEST [=y]) sound/soc/codecs/es8316.c:866:1: warning: data definition has no type or storage class 866 | module_i2c_driver(es8316_i2c_driver); sound/soc/codecs/es8316.c:866:1: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int] sound/soc/codecs/es8316.c:866:1: warning: parameter names (without types) in function declaration sound/soc/codecs/es8316.c:857:26: warning: ‘es8316_i2c_driver’ defined but not used [-Wunused-variable] 857 | static struct i2c_driver es8316_i2c_driver = { Fixes: f94fa8405801 ("ASoC: amd: enable machine driver build for Jadeite platform") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> --- sound/soc/amd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -28,7 +28,7 @@ config SND_SOC_AMD_ST_ES8336_MACH select SND_SOC_ACPI if ACPI select SND_SOC_ES8316 depends on SND_SOC_AMD_ACP && ACPI - depends on I2C || COMPILE_TEST + depends on I2C help This option enables machine driver for Jadeite platform using es8336 codec.

2 1

[PATCH] ASoC: amd: Fix error pointer dereference
by Dan Carpenter 13 Jul '22

13 Jul '22

The "gpio_pa" pointer is an error pointer, there is no need to try put it. Calling gpiod_put() on it will lead to an error pointer dereference. Fixes: 02527c3f2300 ("ASoC: amd: add Machine driver for Jadeite platform") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/amd/acp-es8336.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index d501618b78f6..2fe8df86053a 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -212,7 +212,6 @@ static int st_es8336_late_probe(struct snd_soc_card *card) if (IS_ERR(gpio_pa)) { ret = dev_err_probe(card->dev, PTR_ERR(gpio_pa), "could not get pa-enable GPIO\n"); - gpiod_put(gpio_pa); put_device(codec_dev); return ret; } -- 2.35.1

2 1

[PATCH] ASoc: audio-graph-card2: Fix refcount leak bug in __graph_get_type()
by Liang He 13 Jul '22

13 Jul '22

We should call of_node_put() for the reference before its replacement as it returned by of_get_parent() which has increased the refcount. Besides, we should also call of_node_put() before return. Fixes: c8c74939f791 ("ASoC: audio-graph-card2: add Multi CPU/Codec support") Signed-off-by: Liang He <windhl(a)126.com> --- sound/soc/generic/audio-graph-card2.c | 35 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 77ac4051b827..4f6bae73bd5e 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -229,7 +229,8 @@ enum graph_type { static enum graph_type __graph_get_type(struct device_node *lnk) { - struct device_node *np; + struct device_node *np, *parent_np; + enum graph_type ret; /* * target { @@ -240,19 +241,33 @@ static enum graph_type __graph_get_type(struct device_node *lnk) * }; */ np = of_get_parent(lnk); - if (of_node_name_eq(np, "ports")) - np = of_get_parent(np); + if (of_node_name_eq(np, "ports")) { + parent_np = of_get_parent(np); + of_node_put(np); + np = parent_np; + } - if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) - return GRAPH_MULTI; + if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) { + ret = GRAPH_MULTI; + goto out_put; + } - if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) - return GRAPH_DPCM; + if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) { + ret = GRAPH_DPCM; + goto out_put; + } - if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) - return GRAPH_C2C; + if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) { + ret = GRAPH_C2C; + goto out_put; + } + + ret = GRAPH_NORMAL; + +out_put: + of_node_put(np); + return ret; - return GRAPH_NORMAL; } static enum graph_type graph_get_type(struct asoc_simple_priv *priv, -- 2.25.1

2 1

[PATCH] ASoC: mt6359: Fix refcount leak bug
by Liang He 13 Jul '22

13 Jul '22

In mt6359_parse_dt() and mt6359_accdet_parse_dt(), we should call of_node_put() for the reference returned by of_get_child_by_name() which has increased the refcount. Fixes: 683530285316 ("ASoC: mt6359: fix failed to parse DT properties") Fixes: eef07b9e0925 ("ASoC: mediatek: mt6359: add MT6359 accdet jack driver") Signed-off-by: Liang He <windhl(a)126.com> --- sound/soc/codecs/mt6359-accdet.c | 1 + sound/soc/codecs/mt6359.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index 6d3d170144a0..c190628e2905 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -675,6 +675,7 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) sizeof(struct three_key_threshold)); } + of_node_put(node); dev_warn(priv->dev, "accdet caps=%x\n", priv->caps); return 0; diff --git a/sound/soc/codecs/mt6359.c b/sound/soc/codecs/mt6359.c index 23709b180409..c9a453ce8a2a 100644 --- a/sound/soc/codecs/mt6359.c +++ b/sound/soc/codecs/mt6359.c @@ -2778,6 +2778,7 @@ static int mt6359_parse_dt(struct mt6359_priv *priv) ret = of_property_read_u32(np, "mediatek,mic-type-2", &priv->mux_select[MUX_MIC_TYPE_2]); + of_node_put(np); if (ret) { dev_info(priv->dev, "%s() failed to read mic-type-2, use default (%d)\n", -- 2.25.1

2 1

[PATCH 1/2] soundwire: bus: remove use of __func__ in dev_dbg
by Bard Liao 13 Jul '22

13 Jul '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> The module and function information can be added with 'modprobe foo dyndbg=+pmf' Suggested-by: Greg KH <gregkh(a)linuxfoundation.org> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 8970f8560766..2772973eebb1 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -827,13 +827,13 @@ static void sdw_modify_slave_status(struct sdw_slave *slave, mutex_lock(&bus->bus_lock); dev_vdbg(bus->dev, - "%s: changing status slave %d status %d new status %d\n", - __func__, slave->dev_num, slave->status, status); + "changing status slave %d status %d new status %d\n", + slave->dev_num, slave->status, status); if (status == SDW_SLAVE_UNATTACHED) { dev_dbg(&slave->dev, - "%s: initializing enumeration and init completion for Slave %d\n", - __func__, slave->dev_num); + "initializing enumeration and init completion for Slave %d\n", + slave->dev_num); init_completion(&slave->enumeration_complete); init_completion(&slave->initialization_complete); @@ -841,8 +841,8 @@ static void sdw_modify_slave_status(struct sdw_slave *slave, } else if ((status == SDW_SLAVE_ATTACHED) && (slave->status == SDW_SLAVE_UNATTACHED)) { dev_dbg(&slave->dev, - "%s: signaling enumeration completion for Slave %d\n", - __func__, slave->dev_num); + "signaling enumeration completion for Slave %d\n", + slave->dev_num); complete(&slave->enumeration_complete); } @@ -1849,8 +1849,8 @@ int sdw_handle_slave_status(struct sdw_bus *bus, "Update Slave status failed:%d\n", ret); if (attached_initializing) { dev_dbg(&slave->dev, - "%s: signaling initialization completion for Slave %d\n", - __func__, slave->dev_num); + "signaling initialization completion for Slave %d\n", + slave->dev_num); complete(&slave->initialization_complete); -- 2.25.1

1 1

[PATCH 0/3] soundwire: allocate device_number with IDA
by Bard Liao 13 Jul '22

13 Jul '22

The device_number is currently allocated in the scope of each bus and does not need to be unique at the system level. This leads e.g. on Dell devices with three or four Device1 on different bus segments. To make the device_number unique at the system level, and unified with the HDaudio/iDISP SDI values, this PRs allocates the dev_number with an IDA restricted between 4 and 11 (inclusive). Pierre-Louis Bossart (3): soundwire: bus: rename sdw_ida as sdw_bus_ida soundwire: bus: allow device number to be unique at system level soundwire: intel: set dev_num_ida_min drivers/soundwire/bus.c | 29 ++++++++++++++++++++--------- drivers/soundwire/intel.c | 4 ++++ include/linux/soundwire/sdw.h | 4 ++++ 3 files changed, 28 insertions(+), 9 deletions(-) -- 2.25.1

1 3

[bug report] ASoC: amd: acp: ACP code generic to support newer platforms
by Dan Carpenter 13 Jul '22

13 Jul '22

Hello V sujith kumar Reddy, This is a semi-automatic email about new static checker warnings. The patch b24484c18b10: "ASoC: amd: acp: ACP code generic to support newer platforms" from Jul 7, 2022, leads to the following Smatch complaint: sound/soc/amd/acp/acp-platform.c:99 i2s_irq_handler() warn: variable dereferenced before check 'adata' (see line 94) sound/soc/amd/acp/acp-platform.c 93 struct acp_dev_data *adata = data; 94 struct acp_resource *rsrc = adata->rsrc; ^^^^^^^^^^^ The patch adds a new dereference 95 struct acp_stream *stream; 96 u16 i2s_flag = 0; 97 u32 val, val1, i; 98 99 if (!adata) ^^^^^^ The old code assumed that "adata" could be NULL but hopefully that check can be removed? 100 return IRQ_NONE; 101 regards, dan carpenter

1 0

snd-aloop working no more on 1.2.7.1
by GitHub issues - edited 13 Jul '22

13 Jul '22

alsa-project/alsa-lib issue #251 was edited from tramchamploo: ``` pcm.er4s { # Direct hardware access type hw # Loopback card name # # Has to match "id" in the options of the snd-aloop module card "Loopback" # Loopback device ID device 0 # Number of audio channels # # Has to match the number of channels in music player app # and in the CamillaDSP input configuration channels 2 # Format of audio stream # # Has to match the format defined in the # of the CamillaDSP input configuration format "FLOAT_LE" # Sampling-rate of audio stream # # Has to match the sampling-rate defined in the # CamillaDSP configuration rate 48000 } ctl.er4s { type hw card "Loopback" } ``` This is the .asoundrc I'm using, it worked before this update. Now aplay -L doesn't show this device. Using mpd to play to the Loopback gets `snd_pcm_hw_params() failed: Invalid argument`. Here's my mpd config: ``` audio_output { type "alsa" name "Etymotic ER4S" device "er4s" format "48000:f:2" mixer_type "none" replay_gain_handler "none" auto_resample "no" auto_format "no" } resampler { plugin "soxr" quality "custom" precision "28" phase_response "50" passband_end "91" stopband_begin "100" attenu ``` Btw, alsa should really have a detailed specification on asoundrc file. The value of the format option I specify is from a dsp project, otherwise I have no idea what to write here. And according to [https://www.alsa-project.org/alsa-doc/alsa-lib/group___p_c_m.html#gaa14b7f2… it's in a totally different format. Issue URL : https://github.com/alsa-project/alsa-lib/issues/251 Repository URL: https://github.com/alsa-project/alsa-lib

1 0