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

[PATCH] ASoC: fsl: add missing MODULE_DESCRIPTION() macro
by Jeff Johnson 04 Jun '24

04 Jun '24

make allmodconfig && make W=1 C=1 reports: WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/fsl/imx-pcm-dma.o Add the missing invocation of the MODULE_DESCRIPTION() macro. Signed-off-by: Jeff Johnson <quic_jjohnson(a)quicinc.com> --- sound/soc/fsl/imx-pcm-dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 14e94270911c..4fa208d6a032 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -50,4 +50,5 @@ int imx_pcm_dma_init(struct platform_device *pdev) } EXPORT_SYMBOL_GPL(imx_pcm_dma_init); +MODULE_DESCRIPTION("Freescale i.MX PCM DMA interface"); MODULE_LICENSE("GPL"); --- base-commit: 83814698cf48ce3aadc5d88a3f577f04482ff92a change-id: 20240602-md-snd-fsl-imx-pcm-dma-06224c50d4d1

2 1

[PATCH] MAINTAINERS: copy linux-arm-msm for sound/qcom changes
by Dmitry Baryshkov 04 Jun '24

04 Jun '24

Not having linux-arm-msm@ in cc for audio-related changes for Qualcomm platforms means that interested parties can easily miss the patches. Add corresponding L: entry so that linux-arm-msm ML gets CC'ed for audio patches too. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 523d84b2d613..b9bdd1f08005 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18227,6 +18227,7 @@ QCOM AUDIO (ASoC) DRIVERS M: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> M: Banajit Goswami <bgoswami(a)quicinc.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +L: linux-arm-msm(a)vger.kernel.org S: Supported F: Documentation/devicetree/bindings/soc/qcom/qcom,apr* F: Documentation/devicetree/bindings/sound/qcom,* --- base-commit: 9d99040b1bc8dbf385a8aa535e9efcdf94466e19 change-id: 20240531-asoc-qcom-cc-lamsm-be80e19f8cd8 Best regards, -- Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>

3 2

[PATCH] soundwire: Use scope-based resource management in five functions
by Markus Elfring 04 Jun '24

04 Jun '24

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue, 4 Jun 2024 12:30:40 +0200 Scope-based resource management became supported also for another programming interface by contributions of Jonathan Cameron on 2024-02-17. See also the commit 59ed5e2d505bf5f9b4af64d0021cd0c96aec1f7c ("device property: Add cleanup.h based fwnode_handle_put() scope based cleanup."). * Thus use the attribute “__free(fwnode_handle)” at more places. * Reduce scopes for corresponding local variables. * Omit explicit fwnode_handle_put() calls accordingly. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- Previous clarification approach: soundwire: fix usages of device_get_named_child_node() https://lore.kernel.org/lkml/a2036c46-0527-4ac3-a40b-c9c2cd3e185e@web.de/ https://lkml.org/lkml/2024/5/28/1138 drivers/soundwire/amd_manager.c | 9 ++--- drivers/soundwire/intel_auxdevice.c | 12 ++---- drivers/soundwire/mipi_disco.c | 62 +++++++++++------------------ 3 files changed, 31 insertions(+), 52 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 795e223f7e5c..94b867700b2d 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -15,6 +15,7 @@ #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <linux/wait.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -546,7 +547,6 @@ static int amd_sdw_port_enable(struct sdw_bus *bus, static int sdw_master_read_amd_prop(struct sdw_bus *bus) { struct amd_sdw_manager *amd_manager = to_amd_sdw(bus); - struct fwnode_handle *link; struct sdw_master_prop *prop; u32 quirk_mask = 0; u32 wake_en_mask = 0; @@ -556,7 +556,9 @@ static int sdw_master_read_amd_prop(struct sdw_bus *bus) prop = &bus->prop; /* Find manager handle */ snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", bus->link_id); - link = device_get_named_child_node(bus->dev, name); + + struct fwnode_handle *link __free(fwnode_handle) + = device_get_named_child_node(bus->dev, name); if (!link) { dev_err(bus->dev, "Manager node %s not found\n", name); return -EIO; @@ -571,9 +573,6 @@ static int sdw_master_read_amd_prop(struct sdw_bus *bus) amd_manager->wake_en_mask = wake_en_mask; fwnode_property_read_u32(link, "amd-sdw-power-mode", &power_mode_mask); amd_manager->power_mode_mask = power_mode_mask; - - fwnode_handle_put(link); - return 0; } diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c index fd29f4ee6970..17ad3191ecc3 100644 --- a/drivers/soundwire/intel_auxdevice.c +++ b/drivers/soundwire/intel_auxdevice.c @@ -14,6 +14,7 @@ #include <linux/auxiliary_bus.h> #include <sound/pcm_params.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <sound/soc.h> #include <linux/soundwire/sdw_registers.h> #include <linux/soundwire/sdw.h> @@ -123,7 +124,6 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) { struct sdw_master_prop *prop = &bus->prop; struct sdw_intel_prop *intel_prop; - struct fwnode_handle *link; char name[32]; u32 quirk_mask; @@ -131,7 +131,8 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", bus->link_id); - link = device_get_named_child_node(bus->dev, name); + struct fwnode_handle *link __free(fwnode_handle) + = device_get_named_child_node(bus->dev, name); if (!link) { dev_err(bus->dev, "Master node %s not found\n", name); return -EIO; @@ -155,10 +156,8 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY; intel_prop = devm_kzalloc(bus->dev, sizeof(*intel_prop), GFP_KERNEL); - if (!intel_prop) { - fwnode_handle_put(link); + if (!intel_prop) return -ENOMEM; - } /* initialize with hardware defaults, in case the properties are not found */ intel_prop->clde = 0x0; @@ -205,9 +204,6 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) intel_prop->doais, intel_prop->dodse, intel_prop->dods); - - fwnode_handle_put(link); - return 0; } diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c index e5d9df26d4dc..4906532feaec 100644 --- a/drivers/soundwire/mipi_disco.c +++ b/drivers/soundwire/mipi_disco.c @@ -30,7 +30,6 @@ int sdw_master_read_prop(struct sdw_bus *bus) { struct sdw_master_prop *prop = &bus->prop; - struct fwnode_handle *link; char name[32]; int nval, i; @@ -42,7 +41,8 @@ int sdw_master_read_prop(struct sdw_bus *bus) snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", bus->link_id); - link = device_get_named_child_node(bus->dev, name); + struct fwnode_handle *link __free(fwnode_handle) + = device_get_named_child_node(bus->dev, name); if (!link) { dev_err(bus->dev, "Master node %s not found\n", name); return -EIO; @@ -66,10 +66,8 @@ int sdw_master_read_prop(struct sdw_bus *bus) prop->clk_freq = devm_kcalloc(bus->dev, prop->num_clk_freq, sizeof(*prop->clk_freq), GFP_KERNEL); - if (!prop->clk_freq) { - fwnode_handle_put(link); + if (!prop->clk_freq) return -ENOMEM; - } fwnode_property_read_u32_array(link, "mipi-sdw-clock-frequencies-supported", @@ -94,10 +92,8 @@ int sdw_master_read_prop(struct sdw_bus *bus) prop->clk_gears = devm_kcalloc(bus->dev, prop->num_clk_gears, sizeof(*prop->clk_gears), GFP_KERNEL); - if (!prop->clk_gears) { - fwnode_handle_put(link); + if (!prop->clk_gears) return -ENOMEM; - } fwnode_property_read_u32_array(link, "mipi-sdw-supported-clock-gears", @@ -119,9 +115,6 @@ int sdw_master_read_prop(struct sdw_bus *bus) fwnode_property_read_u32(link, "mipi-sdw-command-error-threshold", &prop->err_threshold); - - fwnode_handle_put(link); - return 0; } EXPORT_SYMBOL(sdw_master_read_prop); @@ -169,7 +162,6 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, struct sdw_dpn_prop *dpn, int count, int ports, char *type) { - struct fwnode_handle *node; u32 bit, i = 0; int nval; unsigned long addr; @@ -185,7 +177,8 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, dpn[i].num = bit; - node = device_get_named_child_node(&slave->dev, name); + struct fwnode_handle *node __free(fwnode_handle) + = device_get_named_child_node(&slave->dev, name); if (!node) { dev_err(&slave->dev, "%s dpN not found\n", name); return -EIO; @@ -203,10 +196,8 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, dpn[i].num_words, sizeof(*dpn[i].words), GFP_KERNEL); - if (!dpn[i].words) { - fwnode_handle_put(node); + if (!dpn[i].words) return -ENOMEM; - } fwnode_property_read_u32_array(node, "mipi-sdw-port-wordlength-configs", @@ -244,10 +235,8 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, dpn[i].num_channels, sizeof(*dpn[i].channels), GFP_KERNEL); - if (!dpn[i].channels) { - fwnode_handle_put(node); + if (!dpn[i].channels) return -ENOMEM; - } fwnode_property_read_u32_array(node, "mipi-sdw-channel-number-list", @@ -261,10 +250,8 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, dpn[i].num_ch_combinations, sizeof(*dpn[i].ch_combinations), GFP_KERNEL); - if (!dpn[i].ch_combinations) { - fwnode_handle_put(node); + if (!dpn[i].ch_combinations) return -ENOMEM; - } fwnode_property_read_u32_array(node, "mipi-sdw-channel-combination-list", @@ -286,8 +273,6 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave, /* TODO: Read audio mode */ - fwnode_handle_put(node); - i++; } @@ -302,7 +287,6 @@ int sdw_slave_read_prop(struct sdw_slave *slave) { struct sdw_slave_prop *prop = &slave->prop; struct device *dev = &slave->dev; - struct fwnode_handle *port; int nval; device_property_read_u32(dev, "mipi-sdw-sw-interface-revision", @@ -355,21 +339,21 @@ int sdw_slave_read_prop(struct sdw_slave *slave) &prop->sink_ports); /* Read dp0 properties */ - port = device_get_named_child_node(dev, "mipi-sdw-dp-0-subproperties"); - if (!port) { - dev_dbg(dev, "DP0 node not found!!\n"); - } else { - prop->dp0_prop = devm_kzalloc(&slave->dev, - sizeof(*prop->dp0_prop), - GFP_KERNEL); - if (!prop->dp0_prop) { - fwnode_handle_put(port); - return -ENOMEM; - } - - sdw_slave_read_dp0(slave, port, prop->dp0_prop); + { + struct fwnode_handle *port __free(fwnode_handle) + = device_get_named_child_node(dev, + "mipi-sdw-dp-0-subproperties"); + if (!port) { + dev_dbg(dev, "DP0 node not found!!\n"); + } else { + prop->dp0_prop = devm_kzalloc(&slave->dev, + sizeof(*prop->dp0_prop), + GFP_KERNEL); + if (!prop->dp0_prop) + return -ENOMEM; - fwnode_handle_put(port); + sdw_slave_read_dp0(slave, port, prop->dp0_prop); + } } /* -- 2.45.1

1 0

[PATCH] ASoC: qcom: x1e80100: Add USB DisplayPort plug support
by Krzysztof Kozlowski 04 Jun '24

04 Jun '24

Add support for handling jack events of USB (DisplayPort). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Depends on: https://lore.kernel.org/all/20240422134354.89291-1-srinivas.kandagatla@lina… --- sound/soc/qcom/x1e80100.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/qcom/x1e80100.c b/sound/soc/qcom/x1e80100.c index d7e0bd03dffd..bc00722b7fdd 100644 --- a/sound/soc/qcom/x1e80100.c +++ b/sound/soc/qcom/x1e80100.c @@ -20,12 +20,32 @@ struct x1e80100_snd_data { struct snd_soc_card *card; struct sdw_stream_runtime *sruntime[AFE_PORT_MAX]; struct snd_soc_jack jack; + struct snd_soc_jack hdmi_jack[8]; bool jack_setup; }; static int x1e80100_snd_init(struct snd_soc_pcm_runtime *rtd) { struct x1e80100_snd_data *data = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_jack *hdmi_jack = NULL; + int hdmi_pcm_id = 0; + + switch (cpu_dai->id) { + case DISPLAY_PORT_RX_0: + hdmi_pcm_id = 0; + hdmi_jack = &data->hdmi_jack[hdmi_pcm_id]; + break; + case DISPLAY_PORT_RX_1 ... DISPLAY_PORT_RX_7: + hdmi_pcm_id = cpu_dai->id - DISPLAY_PORT_RX_1 + 1; + hdmi_jack = &data->hdmi_jack[hdmi_pcm_id]; + break; + default: + break; + } + + if (hdmi_jack) + return qcom_snd_dp_jack_setup(rtd, hdmi_jack, hdmi_pcm_id); return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); } -- 2.43.0

2 1

[PATCH v6] ASoC: tas2781: Fix wrong loading calibrated data sequence
by Shenghao Ding 04 Jun '24

04 Jun '24

3 4

[PATCH] ASoC: dmaengine_pcm: terminate dmaengine before synchronize
by Shengjiu Wang 04 Jun '24

04 Jun '24

When dmaengine supports pause function, in suspend state, dmaengine_pause() is called instead of dmaengine_terminate_async(), In end of playback stream, the runtime->state will go to SNDRV_PCM_STATE_DRAINING, if system suspend & resume happen at this time, application will not resume playback stream, the stream will be closed directly, the dmaengine_terminate_async() will not be called before the dmaengine_synchronize(), which violates the call sequence for dmaengine_synchronize(). This behavior also happens for capture streams, but there is no SNDRV_PCM_STATE_DRAINING state for capture. So use dmaengine_tx_status() to check the DMA status if the status is DMA_PAUSED, then call dmaengine_terminate_async() to terminate dmaengine before dmaengine_synchronize(). Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/core/pcm_dmaengine.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 12aa1cef11a1..7346c993a067 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -358,6 +358,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan); int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream) { struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); + struct dma_tx_state state; + enum dma_status status; + + status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state); + if (status == DMA_PAUSED) + dmaengine_terminate_async(prtd->dma_chan); dmaengine_synchronize(prtd->dma_chan); kfree(prtd); @@ -378,6 +384,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close); int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream) { struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); + struct dma_tx_state state; + enum dma_status status; + + status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state); + if (status == DMA_PAUSED) + dmaengine_terminate_async(prtd->dma_chan); dmaengine_synchronize(prtd->dma_chan); dma_release_channel(prtd->dma_chan); -- 2.34.1

1 0

[PATCH] soundwire: bus: suppress probe deferral errors
by Johan Hovold 04 Jun '24

04 Jun '24

Use dev_err_probe() to avoid logging errors on probe deferral: wsa884x-codec sdw:4:0:0217:0204:00:0: Probe of wsa884x-codec failed: -517 Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- drivers/soundwire/bus_type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index c32faace618f..8c3746f0d527 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -112,9 +112,9 @@ static int sdw_drv_probe(struct device *dev) if (!name) name = drv->driver.name; - dev_err(dev, "Probe of %s failed: %d\n", name, ret); dev_pm_domain_detach(dev, false); - return ret; + + return dev_err_probe(dev, ret, "Probe of %s failed\n", name); } mutex_lock(&slave->sdw_dev_lock); -- 2.44.1

2 1

[Question] how to get underlying file descriptors
by GitHub issues - opened 03 Jun '24

03 Jun '24

alsa-project/alsa-lib issue #399 was opened from pfeatherstone: I would like to use Alsa with the asio c++ library. I think all I need is the underlying file descriptor(s) for the device which I can then pass to Asio for polling and do all my asyncio. At the moment you're forced to use pollfd using snd_pcm_poll_descriptors(). Can I just read the fds or are there subtleties? Cheers Issue URL : https://github.com/alsa-project/alsa-lib/issues/399 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

hcontrol,mixer: improve callback GIL state handling
by GitHub pull_request - opened 03 Jun '24

03 Jun '24

alsa-project/alsa-python pull request #12 was opened from perexg: It's an attempt to fix warning seen in #11 . Request URL : https://github.com/alsa-project/alsa-python/pull/12 Patch URL : https://github.com/alsa-project/alsa-python/pull/12.patch Repository URL: https://github.com/alsa-project/alsa-python

1 0

[PATCH 0/3] Dead structs in sound/soc/codecs
by linux＠treblig.org 02 Jun '24

02 Jun '24

From: "Dr. David Alan Gilbert" <linux(a)treblig.org> Clean out a bunch of old structs in sound/soc/codecs. Build tested only. Signed-off-by: Dr. David Alan Gilbert <linux(a)treblig.org> Dr. David Alan Gilbert (3): ASoC: codecs: lpass-rx-macro: remove unused struct 'rx_macro_reg_mask_val' ASoC: codecs: wm0010: remove unused struct 'wm0010_spi_msg' ASoC: codecs: cx2072x: remove unused struct 'cx2072x_eq_ctrl' sound/soc/codecs/cx2072x.c | 5 ----- sound/soc/codecs/lpass-rx-macro.c | 6 ------ sound/soc/codecs/wm0010.c | 8 -------- 3 files changed, 19 deletions(-) -- 2.45.1

4 6