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

[PATCH v2 0/9] add snd_soc_{of_}get_dlc()
by Kuninori Morimoto 21 Jun '23

21 Jun '23

Hi Mark Current soc-core.c has snd_soc_{of_}get_dai_name() to get DAI name for dlc (snd_soc_dai_link_component). It gets .dai_name, but we need .of_node too. Therefor user need to arrange. It will be more useful if it gets both .dai_name and .of_node. This patch adds snd_soc_{of_}get_dlc() for it, and convert to use it. v1 -> v2 - care loongson Link: https://lore.kernel.org/r/87mt12hp75.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (9): ASoC: soc-core.c: add snd_soc_{of_}get_dlc() ASoC: soc-core.c: add index on snd_soc_of_get_dai_name() ASoC: fsl: use snd_soc_{of_}get_dlc() ASoC: qcom: use snd_soc_{of_}get_dlc() ASoC: meson: use snd_soc_{of_}get_dlc() ASoC: samsung: use snd_soc_{of_}get_dlc() ASoC: loongson: use snd_soc_{of_}get_dlc() ASoC: soc-core.c: use snd_soc_{of_}get_dlc() ASoC: simple-card.c: use snd_soc_{of_}get_dlc() include/sound/soc.h | 8 ++- sound/soc/fsl/imx-card.c | 14 +---- sound/soc/fsl/imx-rpmsg.c | 3 +- sound/soc/generic/simple-card-utils.c | 4 +- sound/soc/generic/simple-card.c | 4 +- sound/soc/loongson/loongson_card.c | 34 ++++------ sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- sound/soc/meson/axg-card.c | 3 +- sound/soc/meson/gx-card.c | 3 +- sound/soc/meson/meson-card-utils.c | 16 ++--- sound/soc/meson/meson-card.h | 3 +- sound/soc/qcom/common.c | 13 +--- sound/soc/samsung/odroid.c | 16 +---- sound/soc/soc-core.c | 77 ++++++++++++----------- 14 files changed, 79 insertions(+), 121 deletions(-) -- 2.25.1

2 11

[PATCH] ASoC: intel: sof_sdw: Fixup typo in device link checking
by Charles Keepax 21 Jun '23

21 Jun '23

The loop checking for multiple different devices on a single sdw link contains a typo accidentally using i twice instead of j. Correct to the correct index variable. Fixes: dc5a3e60a4b5 ("ASoC: Intel: sof_sdw: append codec type to dai link name") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 6faf4a43eaf5a..144f082c63fda 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1347,7 +1347,7 @@ static int sof_card_dai_links_create(struct device *dev, if ((SDW_PART_ID(adr_link->adr_d[i].adr) != SDW_PART_ID(adr_link->adr_d[j].adr)) || (SDW_MFG_ID(adr_link->adr_d[i].adr) != - SDW_MFG_ID(adr_link->adr_d[i].adr))) { + SDW_MFG_ID(adr_link->adr_d[j].adr))) { append_codec_type = true; goto out; } -- 2.30.2

2 1

[PATCH 0/8] add snd_soc_{of_}get_dlc()
by Kuninori Morimoto 21 Jun '23

21 Jun '23

Hi Mark Current soc-core.c has snd_soc_{of_}get_dai_name() to get DAI name for dlc (snd_soc_dai_link_component). It gets .dai_name, but we need .of_node too. Therefor user need to arrange. It will be more useful if it gets both .dai_name and .of_node. This patch adds snd_soc_{of_}get_dlc() for it, and convert to use it. Kuninori Morimoto (8): ASoC: soc-core.c: add snd_soc_{of_}get_dlc() ASoC: soc-core.c: add index on snd_soc_of_get_dai_name() ASoC: fsl: use snd_soc_{of_}get_dlc() ASoC: qcom: use snd_soc_{of_}get_dlc() ASoC: meson: use snd_soc_{of_}get_dlc() ASoC: samsung: use snd_soc_{of_}get_dlc() ASoC: soc-core.c: use snd_soc_{of_}get_dlc() ASoC: simple-card.c: use snd_soc_{of_}get_dlc() include/sound/soc.h | 8 ++- sound/soc/fsl/imx-card.c | 14 +---- sound/soc/fsl/imx-rpmsg.c | 3 +- sound/soc/generic/simple-card-utils.c | 4 +- sound/soc/generic/simple-card.c | 4 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- sound/soc/meson/axg-card.c | 3 +- sound/soc/meson/gx-card.c | 3 +- sound/soc/meson/meson-card-utils.c | 16 ++--- sound/soc/meson/meson-card.h | 3 +- sound/soc/qcom/common.c | 13 +--- sound/soc/samsung/odroid.c | 16 +---- sound/soc/soc-core.c | 77 ++++++++++++----------- 13 files changed, 68 insertions(+), 98 deletions(-) -- 2.25.1

2 10

[PATCH][next] ASoC: tas2781: Fix spelling mistake "calibraiton" -> "calibration"
by Colin Ian King 20 Jun '23

20 Jun '23

There is a spelling mistake in a dev_err message. Fix it. Also fix grammar and add space between last word and (%d)". Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/codecs/tas2781-fmwlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c index 432b19ccec8c..cbf0aef2c001 100644 --- a/sound/soc/codecs/tas2781-fmwlib.c +++ b/sound/soc/codecs/tas2781-fmwlib.c @@ -1863,7 +1863,7 @@ static int fw_parse_calibration_data(struct tasdevice_priv *tas_priv, if (tas_fmw->nr_calibrations != 1) { dev_err(tas_priv->dev, - "%s: only support one calibraiton(%d)!\n", + "%s: only supports one calibration (%d)!\n", __func__, tas_fmw->nr_calibrations); goto out; } -- 2.39.2

2 1

[PATCH 1/1] ASoC: dwc: add DMA handshake control
by Maxim Kochetkov 20 Jun '23

20 Jun '23

DMA mode uses hardware handshake signals. DMACR register is used to enable the DMA Controller interface operation. So add DMA enable/disable to i2s_start()/i2s_stop() functions if using DMA mode. Signed-off-by: Maxim Kochetkov <fido_max(a)inbox.ru> --- sound/soc/dwc/dwc-i2s.c | 39 +++++++++++++++++++++++++++++++++++++-- sound/soc/dwc/local.h | 6 ++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 9e7065dd854c..02b9894e99a7 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -150,19 +150,51 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) return IRQ_NONE; } +static void i2s_enable_dma(struct dw_i2s_dev *dev, u32 stream) +{ + u32 dma_reg = i2s_read_reg(dev->i2s_base, I2S_DMACR); + + /* Enable DMA handshake for stream */ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + dma_reg |= I2S_DMAEN_TXBLOCK; + else + dma_reg |= I2S_DMAEN_RXBLOCK; + + i2s_write_reg(dev->i2s_base, I2S_DMACR, dma_reg); +} + +static void i2s_disable_dma(struct dw_i2s_dev *dev, u32 stream) +{ + u32 dma_reg = i2s_read_reg(dev->i2s_base, I2S_DMACR); + + /* Disable DMA handshake for stream */ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) { + dma_reg &= ~I2S_DMAEN_TXBLOCK; + i2s_write_reg(dev->i2s_base, I2S_RTXDMA, 1); + } else { + dma_reg &= ~I2S_DMAEN_RXBLOCK; + i2s_write_reg(dev->i2s_base, I2S_RRXDMA, 1); + } + i2s_write_reg(dev->i2s_base, I2S_DMACR, dma_reg); +} + static void i2s_start(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream) { struct i2s_clk_config_data *config = &dev->config; i2s_write_reg(dev->i2s_base, IER, 1); - i2s_enable_irqs(dev, substream->stream, config->chan_nr); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) i2s_write_reg(dev->i2s_base, ITER, 1); else i2s_write_reg(dev->i2s_base, IRER, 1); + if (dev->use_pio) + i2s_enable_irqs(dev, substream->stream, config->chan_nr); + else + i2s_enable_dma(dev, substream->stream); + i2s_write_reg(dev->i2s_base, CER, 1); } @@ -176,7 +208,10 @@ static void i2s_stop(struct dw_i2s_dev *dev, else i2s_write_reg(dev->i2s_base, IRER, 0); - i2s_disable_irqs(dev, substream->stream, 8); + if (dev->use_pio) + i2s_disable_irqs(dev, substream->stream, 8); + else + i2s_disable_dma(dev, substream->stream); if (!dev->active) { i2s_write_reg(dev->i2s_base, CER, 0); diff --git a/sound/soc/dwc/local.h b/sound/soc/dwc/local.h index d64bd4f8fd34..ba4e397099be 100644 --- a/sound/soc/dwc/local.h +++ b/sound/soc/dwc/local.h @@ -53,6 +53,12 @@ #define I2S_COMP_VERSION 0x01F8 #define I2S_COMP_TYPE 0x01FC +#define I2S_RRXDMA 0x01C4 +#define I2S_RTXDMA 0x01CC +#define I2S_DMACR 0x0200 +#define I2S_DMAEN_RXBLOCK (1 << 16) +#define I2S_DMAEN_TXBLOCK (1 << 17) + /* * Component parameter register fields - define the I2S block's * configuration. -- 2.40.1

2 1

[PATCH 1/1] ASoC: dwc: don't assign addr_width for dt configs
by Maxim Kochetkov 20 Jun '23

20 Jun '23

For proper DMA operation addr_width must corresponds with audio format (S16, S24, S32, etc). Proper bus width calculations is performed by snd_hwparams_to_dma_slave_config(). So drop wrong addr_width asignment for dt configs and let snd_hwparams_to_dma_slave_config() do the job. Signed-off-by: Maxim Kochetkov <fido_max(a)inbox.ru> --- sound/soc/dwc/dwc-i2s.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 9e7065dd854c..21398ee924e4 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -558,13 +558,9 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1); u32 comp2 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_2); u32 fifo_depth = 1 << (1 + COMP1_FIFO_DEPTH_GLOBAL(comp1)); - u32 idx = COMP1_APB_DATA_WIDTH(comp1); u32 idx2; int ret; - if (WARN_ON(idx >= ARRAY_SIZE(bus_widths))) - return -EINVAL; - ret = dw_configure_dai(dev, dw_i2s_dai, SNDRV_PCM_RATE_8000_192000); if (ret < 0) return ret; @@ -574,7 +570,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, dev->capability |= DWC_I2S_PLAY; dev->play_dma_data.dt.addr = res->start + I2S_TXDMA; - dev->play_dma_data.dt.addr_width = bus_widths[idx]; dev->play_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2]) >> 8; dev->play_dma_data.dt.maxburst = 16; @@ -584,7 +579,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, dev->capability |= DWC_I2S_RECORD; dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA; - dev->capture_dma_data.dt.addr_width = bus_widths[idx]; dev->capture_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2] >> 8); dev->capture_dma_data.dt.maxburst = 16; -- 2.40.1

2 1

[PATCH v3 00/11] ASoC: qcom: audioreach: add compress offload support
by Srinivas Kandagatla 20 Jun '23

20 Jun '23

This patchset adds compressed offload support to Qualcomm audioreach drivers. Currently it supports AAC, MP3 and FALC along with gapless. Tested this on SM8450 and sc7280. thanks, srini Changes since v2: - fixed order of sign-off - added placeholder decoder and encoder to audioreach_set_media_format Mohammad Rafi Shaik (4): ASoC: qcom: SC7280: audioreach: Add sc7280 hardware param fixup callback ASoC: q6dsp: q6apm: add end of stream events ASoC: q6dsp: audioreach: Add support to set compress format params ASoC: q6dsp: audioreach: Add gapless feature support Srinivas Kandagatla (7): ASoC: q6dsp: audioreach: add helper function to set u32 param ASoC: q6dsp: audioreach: Add placeholder decoder for compress playback ASoC: q6dsp: q6apm-dai: Add open/free compress DAI callbacks ASoC: q6dsp: q6apm-dai: Add compress DAI and codec caps get callbacks ASoC: q6dsp: q6apm-dai: Add trigger/pointer compress DAI callbacks ASoC: q6dsp: q6apm-dai: Add compress set params and metadata DAI callbacks ASoC: q6dsp: q6apm-dai: Add mmap and copy compress DAI callbacks sound/soc/qcom/qdsp6/audioreach.c | 250 ++++++++++------- sound/soc/qcom/qdsp6/audioreach.h | 51 ++++ sound/soc/qcom/qdsp6/q6apm-dai.c | 445 ++++++++++++++++++++++++++++++ sound/soc/qcom/qdsp6/q6apm.c | 68 +++++ sound/soc/qcom/qdsp6/q6apm.h | 6 + sound/soc/qcom/sc7280.c | 23 +- 6 files changed, 747 insertions(+), 96 deletions(-) -- 2.21.0

2 12

[PATCH 0/2] ASoC: Use maple tree register cache for Everest Semi CODECs
by Mark Brown 20 Jun '23

20 Jun '23

Several of the Everest Semi CODECs only support single register read and write operations and therefore do not benefit from using the rbtree cache over the maple tree cache, convert them to the more modern maple tree cache. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Mark Brown (2): ASoC: es8316: Use maple tree register cache ASoC: es8328: Use maple tree register cache sound/soc/codecs/es8316.c | 2 +- sound/soc/codecs/es8328.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: 9561de3a55bed6bdd44a12820ba81ec416e705a7 change-id: 20230609-asoc-es-maple-3b696631e609 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 3

[regression] Bug 216818 - The microphone mute led not working after linux 6
by Thorsten Leemhuis 20 Jun '23

20 Jun '23

Hi, this is your Linux kernel regression tracker speaking. I noticed a regression report in bugzilla.kernel.org. As many (most?) kernel developer don't keep an eye on it, I decided to forward it by mail. Quoting from https://bugzilla.kernel.org/show_bug.cgi?id=216818 : > sonic82003(a)gmail.com 2022-12-18 08:52:32 UTC > > The mic mute led of my ThinkPad X1 Carbon Gen 9 doesn't work anymore after updating linux to version 6. > I can still turn it on by running > > echo 1 > /sys/class/leds/platform::micmute/brightness > > With linux-lts it still works fine. See the ticket for more details. Note, I found a similar report that (despite my attempts to prevent things like this from happening) fell through the cracks here: https://bugzilla.kernel.org/show_bug.cgi?id=216355 > plum 2022-08-13 02:11:01 UTC > > I upgrade to kernel 5.19.1 but found my thinkpad x1 carbon 2021's mute led stop working. > > Function is okay but LED won't light up. > > Back to kernel 5.18 and it's normal and working again. > > Fedora 36 64 bit > Gnome-shell 42 >From a quick research it looks to me like this is an issue for the sounds maintainers, as the LED itself apparently works. If that is something for the platform people instead please speak up. BTW, let me use this mail to also add the report to the list of tracked regressions to ensure it's doesn't fall through the cracks: #regzbot introduced: v5.18..v5.19 https://bugzilla.kernel.org/show_bug.cgi?id=216818 #regzbot ignore-activity Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) P.S.: As the Linux kernel's regression tracker I deal with a lot of reports and sometimes miss something important when writing mails like this. If that's the case here, don't hesitate to tell me in a public reply, it's in everyone's interest to set the public record straight.

5 5

[bug report] ASoC: loongson: Add Loongson ASoC Sound Card Support
by Dan Carpenter 20 Jun '23

20 Jun '23

Hello Yingkun Meng, The patch d24028606e76: "ASoC: loongson: Add Loongson ASoC Sound Card Support" from Jun 14, 2023, leads to the following Smatch static checker warning: sound/soc/loongson/loongson_card.c:157 loongson_card_parse_of() error: uninitialized symbol 'cpu_dai_name'. sound/soc/loongson/loongson_card.c:158 loongson_card_parse_of() error: uninitialized symbol 'codec_dai_name'. sound/soc/loongson/loongson_card.c 115 static int loongson_card_parse_of(struct loongson_card_data *data) 116 { 117 const char *cpu_dai_name, *codec_dai_name; 118 struct device_node *cpu, *codec; 119 struct snd_soc_card *card = &data->snd_card; 120 struct device *dev = card->dev; 121 struct of_phandle_args args; 122 int ret, i; 123 124 cpu = of_get_child_by_name(dev->of_node, "cpu"); 125 if (!cpu) { 126 dev_err(dev, "platform property missing or invalid\n"); 127 return -EINVAL; 128 } 129 codec = of_get_child_by_name(dev->of_node, "codec"); 130 if (!codec) { 131 dev_err(dev, "audio-codec property missing or invalid\n"); 132 ret = -EINVAL; 133 goto err; 134 } 135 136 ret = of_parse_phandle_with_args(cpu, "sound-dai", 137 "#sound-dai-cells", 0, &args); 138 if (ret) { 139 dev_err(dev, "codec node missing #sound-dai-cells\n"); 140 goto err; 141 } 142 for (i = 0; i < card->num_links; i++) 143 loongson_dai_links[i].cpus->of_node = args.np; 144 145 ret = of_parse_phandle_with_args(codec, "sound-dai", 146 "#sound-dai-cells", 0, &args); 147 if (ret) { 148 dev_err(dev, "codec node missing #sound-dai-cells\n"); 149 goto err; 150 } 151 for (i = 0; i < card->num_links; i++) 152 loongson_dai_links[i].codecs->of_node = args.np; 153 154 snd_soc_of_get_dai_name(cpu, &cpu_dai_name); 155 snd_soc_of_get_dai_name(codec, &codec_dai_name); It looks like snd_soc_of_get_dai_name() can fail but I can add an exception for that if it never fails in real life. 156 for (i = 0; i < card->num_links; i++) { --> 157 loongson_dai_links[i].cpus->dai_name = cpu_dai_name; 158 loongson_dai_links[i].codecs->dai_name = codec_dai_name; 159 } 160 of_node_put(cpu); 161 of_node_put(codec); 162 163 return 0; 164 165 err: 166 of_node_put(cpu); 167 of_node_put(codec); 168 return ret; 169 } regards, dan carpenter

2 1