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

[alsa-devel] [PATCH] ASoC: fsl_esai: Support synchronous mode
by S.j. Wang 03 Apr '19

03 Apr '19

In ESAI synchronous mode, the clock is generated by Tx, So we should always set registers of Tx which relate with the bit clock and frame clock generation (TCCR, TCR, ECR), even there is only Rx is working. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_esai.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 3623aa9a6f2e..d9fcddd55c02 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -230,6 +230,21 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, return -EINVAL; } + if (esai_priv->synchronous && !tx) { + switch (clk_id) { + case ESAI_HCKR_FSYS: + fsl_esai_set_dai_sysclk(dai, ESAI_HCKT_FSYS, + freq, dir); + break; + case ESAI_HCKR_EXTAL: + fsl_esai_set_dai_sysclk(dai, ESAI_HCKT_EXTAL, + freq, dir); + break; + default: + return -EINVAL; + } + } + /* Bypass divider settings if the requirement doesn't change */ if (freq == esai_priv->hck_rate[tx] && dir == esai_priv->hck_dir[tx]) return 0; @@ -537,10 +552,21 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream, bclk = params_rate(params) * slot_width * esai_priv->slots; - ret = fsl_esai_set_bclk(dai, tx, bclk); + ret = fsl_esai_set_bclk(dai, esai_priv->synchronous ? true : tx, bclk); if (ret) return ret; + if (esai_priv->synchronous && !tx) { + /* Use Normal mode to support monaural audio */ + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, + ESAI_xCR_xMOD_MASK, params_channels(params) > 1 ? + ESAI_xCR_xMOD_NETWORK : 0); + + mask = ESAI_xCR_xSWS_MASK | ESAI_xCR_PADC; + val = ESAI_xCR_xSWS(slot_width, width) | ESAI_xCR_PADC; + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, val); + } + /* Use Normal mode to support monaural audio */ regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), ESAI_xCR_xMOD_MASK, params_channels(params) > 1 ? -- 1.9.1

2 4

[alsa-devel] [PATCH] ALSA: doc: my_chip has no element ioport
by Christina Quast 03 Apr '19

03 Apr '19

chip->ioport is dereferenced in two places, but the struct is defined as follows: struct mychip { struct snd_card *card; struct pci_dev *pci; unsigned long port; int irq; }; Signed-off-by: Christina Quast <cquast(a)hanoverdisplays.com> --- Documentation/sound/kernel-api/writing-an-alsa-driver.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/sound/kernel-api/writing-an-alsa-driver.rst b/Documentation/sound/kernel-api/writing-an-alsa-driver.rst index 6b154dbb02cc..132f5eb9b530 100644 --- a/Documentation/sound/kernel-api/writing-an-alsa-driver.rst +++ b/Documentation/sound/kernel-api/writing-an-alsa-driver.rst @@ -324,7 +324,7 @@ to details explained in the following section. strcpy(card->driver, "My Chip"); strcpy(card->shortname, "My Own Chip 123"); sprintf(card->longname, "%s at 0x%lx irq %i", - card->shortname, chip->ioport, chip->irq); + card->shortname, chip->port, chip->irq); /* (5) */ .... /* implemented later */ @@ -437,7 +437,7 @@ Since each component can be properly freed, the single strcpy(card->driver, "My Chip"); strcpy(card->shortname, "My Own Chip 123"); sprintf(card->longname, "%s at 0x%lx irq %i", - card->shortname, chip->ioport, chip->irq); + card->shortname, chip->port, chip->irq); The driver field holds the minimal ID string of the chip. This is used by alsa-lib's configurator, so keep it simple but unique. Even the -- 2.20.1

2 1

[alsa-devel] alc295_fixup_chromebook function
by Kailang 03 Apr '19

03 Apr '19

Hi Takashi, You applied below patch. https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?h=f… But I think ALC225_FIXUP_HEADSET_JACK will applicate for enable for headset button. It was not only use for Chrome OS. So, ALC225_FIXUP_HEADSET_JACK and alc295_fixup_chromebook separation were be better. Intel test https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?h=f… this patch. Mic JD was also not stable. (I don't know why. It passed with Ubuntu OS.) It need to change to initial state would be better. (original was HDA_FIXUP_ACT_PRE_PROBE) +static void alc295_fixup_chromebook(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + + switch (action) { + case HDA_FIXUP_ACT_INIT: + switch (codec->core.vendor_id) { + case 0x10ec0295: + alc_update_coef_idx(codec, 0x4a, 0x8000, 1 << 15); /* Reset HP JD */ + alc_update_coef_idx(codec, 0x4a, 0x8000, 0 << 15); + break; + case 0x10ec0236: + alc_update_coef_idx(codec, 0x1b, 0x8000, 1 << 15); /* Reset HP JD */ + alc_update_coef_idx(codec, 0x1b, 0x8000, 0 << 15); + break; + } + break; + } +} How could I create a fix patch for this? Thanks. BR, Kailang

3 5

[alsa-devel] [PATCH] ASoC: Mediatek: MT8183: DA7219: fix build error
by Anders Roxell 03 Apr '19

03 Apr '19

When building CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m the following errro pops up: ../sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c: In function ‘mt8183_da7219_max98357_dev_probe’: ../sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c:413:13: error: ‘struct snd_soc_dai_link’ has no member named ‘platform’; did you mean ‘platforms’? dai_link->platform = NULL; ^~~~~~~~ platforms Rework to use 'dai_link->platforms' instead of 'dai_link->platform'. Fixes: ebbddc75bbe8 ("ASoC: Mediatek: MT8183: Add machine driver with DA7219") Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 93536659a859..1e7e8aed8707 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -410,7 +410,7 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) * the "platform" will not null when probe is trying * again. It's not expected normally. */ - dai_link->platform = NULL; + dai_link->platforms = NULL; if (dai_link->platform_name) continue; -- 2.20.1

2 1

[alsa-devel] [asoc:for-5.2 101/107] sound/soc/sprd/sprd-pcm-compress.c:110 sprd_platform_compr_drain_notify() warn: variable dereferenced before check 'cstream' (see line 105)
by Dan Carpenter 03 Apr '19

03 Apr '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2 head: 6d5e2bf9d203e4d9e08ca2e9420c6ff22ad190af commit: cce1396936ef2b347d622b4d49718818eb32029d [101/107] ASoC: sprd: Add Spreadtrum audio compress offload support smatch warnings: sound/soc/sprd/sprd-pcm-compress.c:110 sprd_platform_compr_drain_notify() warn: variable dereferenced before check 'cstream' (see line 105) # https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?i… git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout cce1396936ef2b347d622b4d49718818eb32029d vim +/cstream +110 sound/soc/sprd/sprd-pcm-compress.c cce13969 Baolin Wang 2019-03-27 98 cce13969 Baolin Wang 2019-03-27 99 static int sprd_platform_compr_trigger(struct snd_compr_stream *cstream, cce13969 Baolin Wang 2019-03-27 100 int cmd); cce13969 Baolin Wang 2019-03-27 101 cce13969 Baolin Wang 2019-03-27 102 static void sprd_platform_compr_drain_notify(void *arg) cce13969 Baolin Wang 2019-03-27 103 { cce13969 Baolin Wang 2019-03-27 104 struct snd_compr_stream *cstream = arg; cce13969 Baolin Wang 2019-03-27 @105 struct snd_compr_runtime *runtime = cstream->runtime; ^^^^^^^^^^^^^^^^ cce13969 Baolin Wang 2019-03-27 106 struct sprd_compr_stream *stream = runtime->private_data; cce13969 Baolin Wang 2019-03-27 107 cce13969 Baolin Wang 2019-03-27 108 memset(stream->info_area, 0, sizeof(struct sprd_compr_playinfo)); cce13969 Baolin Wang 2019-03-27 109 cce13969 Baolin Wang 2019-03-27 @110 if (cstream) ^^^^^^^ cce13969 Baolin Wang 2019-03-27 111 snd_compr_drain_notify(cstream); cce13969 Baolin Wang 2019-03-27 112 } cce13969 Baolin Wang 2019-03-27 113 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [PATCH resend 0/3] ASoC: Intel: Misc. fixes
by Hans de Goede 03 Apr '19

03 Apr '19

Hi Pierre-Louis, Mark, These 3 patches (originally 2 different patch-sets) seem to have fallen through the cracks, hence this resend. Pierre-Louis, can you review these 3 patches please? Regards, Hans

3 7

[alsa-devel] [PATCH] ASoC: sprd: Fix modular build
by Mark Brown 03 Apr '19

03 Apr '19

Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Suggested-by: Baolin Wang <baolin.wang(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sprd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sprd/Makefile b/sound/soc/sprd/Makefile index fa1d5476b8da..e6c2606da8e2 100644 --- a/sound/soc/sprd/Makefile +++ b/sound/soc/sprd/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Spreadtrum Audio Support -obj-$(CONFIG_SND_SOC_SPRD) += sprd-pcm-dma.o sprd-pcm-compress.o +snd-soc-sprd-platform-objs := sprd-pcm-dma.o sprd-pcm-compress.o + +obj-$(CONFIG_SND_SOC_SPRD) += snd-soc-sprd-platform.o -- 2.20.1

2 2

[alsa-devel] [RFC PATCH V2] ASoC: hdac_hdmi: add device PM dependency
by libin.yang＠intel.com 03 Apr '19

03 Apr '19

From: Libin Yang <libin.yang(a)intel.com> HDMI audio codec register operation depends on the display audio power domain. The hdmi audio codec dapm event callback must be called after display audio power is turned on. Add hdac_hdmi_device_link_add/del() in HDMI audio codec driver. The customer audio driver, such as cAVS/SST and SOF audio driver, can call the function to set/remove the audio power dependency. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/hdac_hdmi.h | 7 ++++ 2 files changed, 93 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 5eeb0fe..7490219 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -133,6 +133,12 @@ struct hdac_hdmi_drv_data { int port_num; }; +/* each supplier - consumer pair has one instance of this structure */ +struct hdac_hdmi_dev_link { + struct list_head head; + struct device_link *link; +}; + struct hdac_hdmi_priv { struct hdac_device *hdev; struct snd_soc_component *component; @@ -141,10 +147,12 @@ struct hdac_hdmi_priv { struct list_head pin_list; struct list_head cvt_list; struct list_head pcm_list; + struct list_head link_list; /* supplier - consumer pairs */ int num_pin; int num_cvt; int num_ports; struct mutex pin_mutex; + struct mutex link_mutex; struct hdac_chmap chmap; struct hdac_hdmi_drv_data *drv_data; struct snd_soc_dai_driver *dai_drv; @@ -1792,6 +1800,72 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, } EXPORT_SYMBOL_GPL(hdac_hdmi_jack_init); +/** + * hdac_hdmi_device_link_add - add a link between consumer and hdev device + * @consumer: Consumer end of the link. + * @component: The hdmi codec component. + * @flags: Link flags. + * + * If there is a consumer of the hdev device, which means a consumer device + * operation depends on the hdev device power status, the consumer device + * driver should call this function. It supports several consumers depending + * on the same hdmi codec hdev device. + * + * Return: pointer of device_link, or NULL if fails to create device_link + */ +struct device_link * +hdac_hdmi_device_link_add(struct device *consumer, + struct snd_soc_component *component, + u32 flags) +{ + struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component); + struct hdac_device *hdev = hdmi->hdev; + struct hdac_hdmi_dev_link *dev_link; + + dev_link = devm_kzalloc(&hdev->dev, sizeof(*dev_link), GFP_KERNEL); + if (!dev_link) + return NULL; + + dev_link->link = device_link_add(consumer, &hdev->dev, flags); + + mutex_lock(&hdmi->link_mutex); + if (dev_link->link) + list_add(&dev_link->head, &hdmi->link_list); + mutex_unlock(&hdmi->link_mutex); + + return dev_link->link; +} +EXPORT_SYMBOL_GPL(hdac_hdmi_device_link_add); + +/** + * hdac_hdmi_device_link_del - del the link between consumer and hdev device + * @consumer: Consumer end of the link. + * @component: The hdmi codec component. + * + * If the consumer doesn't need the dependency any longer, the consumer device + * driver should call this function to release the device_link + */ +void hdac_hdmi_device_link_del(struct device *consumer, + struct snd_soc_component *component) +{ + struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component); + struct hdac_device *hdev = hdmi->hdev; + struct hdac_hdmi_dev_link *dev_link, *tmp; + + mutex_lock(&hdmi->link_mutex); + list_for_each_entry_safe(dev_link, tmp, &hdmi->link_list, head) { + if (dev_link->link->consumer == consumer && + dev_link->link->supplier == &hdev->dev) { + device_link_del(dev_link->link); + list_del(&dev_link->head); + devm_kfree(&hdev->dev, dev_link); + return; + } + } + mutex_unlock(&hdmi->link_mutex); +} +EXPORT_SYMBOL_GPL(hdac_hdmi_device_link_del); + static void hdac_hdmi_present_sense_all_pins(struct hdac_device *hdev, struct hdac_hdmi_priv *hdmi, bool detect_pin_caps) { @@ -2031,7 +2105,9 @@ static int hdac_hdmi_dev_probe(struct hdac_device *hdev) INIT_LIST_HEAD(&hdmi_priv->pin_list); INIT_LIST_HEAD(&hdmi_priv->cvt_list); INIT_LIST_HEAD(&hdmi_priv->pcm_list); + INIT_LIST_HEAD(&hdmi_priv->link_list); mutex_init(&hdmi_priv->pin_mutex); + mutex_init(&hdmi_priv->link_mutex); /* * Turned off in the runtime_suspend during the first explicit @@ -2058,8 +2134,18 @@ static int hdac_hdmi_dev_probe(struct hdac_device *hdev) static int hdac_hdmi_dev_remove(struct hdac_device *hdev) { + struct hdac_hdmi_dev_link *dev_link, *tmp; + struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev); + snd_hdac_display_power(hdev->bus, hdev->addr, false); + mutex_unlock(&hdmi->link_mutex); + list_for_each_entry_safe(dev_link, tmp, &hdmi->link_list, head) { + device_link_del(dev_link->link); + list_del(&dev_link->head); + } + mutex_unlock(&hdmi->link_mutex); + return 0; } diff --git a/sound/soc/codecs/hdac_hdmi.h b/sound/soc/codecs/hdac_hdmi.h index 4fa2fc9..e877167 100644 --- a/sound/soc/codecs/hdac_hdmi.h +++ b/sound/soc/codecs/hdac_hdmi.h @@ -7,4 +7,11 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int pcm, int hdac_hdmi_jack_port_init(struct snd_soc_component *component, struct snd_soc_dapm_context *dapm); + +struct device_link * +hdac_hdmi_device_link_add(struct device *consumer, + struct snd_soc_component *component, + u32 flags); +void hdac_hdmi_device_link_del(struct device *consumer, + struct snd_soc_component *component); #endif /* __HDAC_HDMI_H__ */ -- 2.7.4

2 2

[alsa-devel] [PATCH 1/3] ASoC: wm_adsp: Check for buffer in trigger stop
by Charles Keepax 03 Apr '19

03 Apr '19

Trigger stop can be called in situations where trigger start failed and as such it can't be assumed the buffer is already attached to the compressed stream or a NULL pointer may be dereferenced. Fixes: 639e5eb3c7d6 ("ASoC: wm_adsp: Correct handling of compressed streams that restart") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 0aa62b26f61cc..2da4ba2da42a8 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -3952,7 +3952,8 @@ int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd) } break; case SNDRV_PCM_TRIGGER_STOP: - wm_adsp_buffer_clear(compr->buf); + if (wm_adsp_compr_attached(compr)) + wm_adsp_buffer_clear(compr->buf); break; default: ret = -EINVAL; -- 2.11.0

2 5

[alsa-devel] [asoc:for-5.2 98/99] sound/soc/codecs/tlv320aic31xx.c:1267:5: sparse: symbol 'aic31xx_set_jack' was not declared. Should it be static?
by kbuild test robot 03 Apr '19

03 Apr '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2 head: 90f0202bf2e15e8933a550b7dfd439b500a76e1c commit: ebf3326cd96989a498892a1b344faee3110f7877 [98/99] ASoC: tlv320aic31xx: Add headphone/headset detection reproduce: # apt-get install sparse git checkout ebf3326cd96989a498892a1b344faee3110f7877 make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' sparse warnings: (new ones prefixed by >>) >> sound/soc/codecs/tlv320aic31xx.c:1267:5: sparse: symbol 'aic31xx_set_jack' was not declared. Should it be static? Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 2