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

[PATCH v3 0/2] Fix apq8016 compat string
by Bryan O'Donoghue 28 Jun '22

28 Jun '22

V3: - Marks qcom,lpass-cpu-apq8016 as deprecated instead of removing - Bjorn V2: - Adds Reviewed-by: - Srini - Adds Fixes - Srini V1: Reusing the apq8016 on msm8939 I found running checkpatch that the compat string for the LPASS was throwing a warning. This is easily fixed by alinging the YAML, DTS and driver to the documented compat string - compatible = "qcom,lpass-cpu-apq8016"; + compatible = "qcom,apq8016-lpass-cpu"; Bryan O'Donoghue (2): ASoC: qcom: lpass: Fix apq8016 compat string to match yaml arm64: dts: qcom: Fix apq8016 compat string to match yaml arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- sound/soc/qcom/lpass-apq8016.c | 1 + sound/soc/qcom/lpass-cpu.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) -- 2.35.1

3 5

[PATCH 0/8] ASoC: max98396: Some assorted fixes and additions
by Daniel Mack 28 Jun '22

28 Jun '22

This is a series of some patches that I collected while using the max98396 driver is a TDM mode setup. They correct BSEL and PCM mode configs, add support for power supplies and add some bits to the documentation. The code is tested in TDM-16 and TDM-8 mode with 32 channel width. Thanks, Daniel Daniel Mack (8): ASoC: dt-bindings: max98396: add voltage supplies ASoC: dt-bindings: max98396: Add #sound-dai-cells ASoC: dt-bindings: max98396: Document adi,bypass-slot-no ASoC: max98396: add voltage regulators ASoC: max98396: Improve some error prints ASoC: max98396: Fix register access for PCM format settings ASoC: max98396: Implement DSP speaker monitor ASoC: max98396: Fix TDM mode BSEL settings .../bindings/sound/adi,max98396.yaml | 34 ++- sound/soc/codecs/max98396.c | 265 ++++++++++++++---- sound/soc/codecs/max98396.h | 8 + 3 files changed, 257 insertions(+), 50 deletions(-) -- 2.36.1

3 16

[PATCH] ASoC: samsung: s3c24xx-i2s: Fix typo in DAIFMT handling
by Charles Keepax 27 Jun '22

27 Jun '22

The conversion of the set_fmt callback to direct clock specification included a small typo, correct the affected code. Fixes: 91c49199e6d6 ("ASoC: samsung: Update to use set_fmt_new callback") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/samsung/s3c24xx-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 4082ad7cbcc11..c1a314b86b155 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -170,7 +170,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_dai *cpu_dai, pr_debug("hw_params r: IISMOD: %x \n", iismod); switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { - case SND_SOC_DAIFMT_BC_CFC: + case SND_SOC_DAIFMT_BC_FC: iismod |= S3C2410_IISMOD_SLAVE; break; case SND_SOC_DAIFMT_BP_FP: -- 2.30.2

3 9

RT711/RT711-SDCA: use codec switch/volume
by GitHub pull_request - opened 27 Jun '22

27 Jun '22

alsa-project/alsa-ucm-conf pull request #180 was opened from plbossart: This PR uses the settings provided by @shumingfan in https://github.com/alsa-project/alsa-ucm-conf/issues/179 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/180 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/180.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: tlv320adcx140: Fix tx_mask check
by Sascha Hauer 27 Jun '22

27 Jun '22

The tx_mask check doesn't reflect what the driver and the chip support. The check currently checks for exactly two slots being enabled. The tlv320adcx140 supports anything between one and eight channels, so relax the check accordingly. The tlv320adcx140 supports arbitrary tx_mask settings, but the driver currently only supports adjacent slots beginning with the first slot, so extend the check to check that the first slot is being used and that there are no holes in the tx_mask. Leave a comment to make it's the driver that limits the tx_mask settings, not the chip itself. While at it remove the set-but-unused struct adcx140p_priv::tdm_delay field. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> --- sound/soc/codecs/tlv320adcx140.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c index b55f0b836932b..0b729658fde80 100644 --- a/sound/soc/codecs/tlv320adcx140.c +++ b/sound/soc/codecs/tlv320adcx140.c @@ -33,7 +33,6 @@ struct adcx140_priv { bool micbias_vg; unsigned int dai_fmt; - unsigned int tdm_delay; unsigned int slot_width; }; @@ -792,12 +791,13 @@ static int adcx140_set_dai_tdm_slot(struct snd_soc_dai *codec_dai, { struct snd_soc_component *component = codec_dai->component; struct adcx140_priv *adcx140 = snd_soc_component_get_drvdata(component); - unsigned int lsb; - /* TDM based on DSP mode requires slots to be adjacent */ - lsb = __ffs(tx_mask); - if ((lsb + 1) != __fls(tx_mask)) { - dev_err(component->dev, "Invalid mask, slots must be adjacent\n"); + /* + * The chip itself supports arbitrary masks, but the driver currently + * only supports adjacent slots beginning at the first slot. + */ + if (tx_mask != GENMASK(__fls(tx_mask), 0)) { + dev_err(component->dev, "Only lower adjacent slots are supported\n"); return -EINVAL; } @@ -812,7 +812,6 @@ static int adcx140_set_dai_tdm_slot(struct snd_soc_dai *codec_dai, return -EINVAL; } - adcx140->tdm_delay = lsb; adcx140->slot_width = slot_width; return 0; -- 2.30.2

2 1

[PATCH v4] ASoC: ti: omap-mcbsp: duplicate sysfs error
by David Owens 27 Jun '22

27 Jun '22

From: David Owens <daowens01(a)gmail.com> Convert to managed versions of sysfs and clk allocation to simplify unbinding and error handling in probe. Managed sysfs node creation specifically addresses the following error seen the second time probe is attempted after sdma_pcm_platform_register() previously requsted probe deferral: sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' Signed-off-by: David Owens <dowens(a)precisionplanting.com> --- Changes in v4: * Reverted change that added use ATTRIBUTE_GROUP and left the attribute structs as-is to fix compilation error and lessen the area of impact. Changes in v3: * Whitespace changes only to allow clean apply Changes in v2: * Improved error handling --- sound/soc/ti/omap-mcbsp-priv.h | 2 -- sound/soc/ti/omap-mcbsp-st.c | 14 ++------------ sound/soc/ti/omap-mcbsp.c | 19 ++----------------- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h index 7865cda4bf0a..da519ea1f303 100644 --- a/sound/soc/ti/omap-mcbsp-priv.h +++ b/sound/soc/ti/omap-mcbsp-priv.h @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, /* Sidetone specific API */ int omap_mcbsp_st_init(struct platform_device *pdev); -void omap_mcbsp_st_cleanup(struct platform_device *pdev); - int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index 0bc7d26c660a..7e8179cae92e 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -347,7 +347,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data) return -ENOMEM; - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); if (IS_ERR(st_data->mcbsp_iclk)) { dev_warn(mcbsp->dev, "Failed to get ick, sidetone might be broken\n"); @@ -359,7 +359,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data->io_base_st) return -ENOMEM; - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); + ret = devm_device_add_group(mcbsp->dev, &sidetone_attr_group); if (ret) return ret; @@ -368,16 +368,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) return 0; } -void omap_mcbsp_st_cleanup(struct platform_device *pdev) -{ - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - - if (mcbsp->st_data) { - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); - clk_put(mcbsp->st_data->mcbsp_iclk); - } -} - static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 58d8e200a7b9..9fb7cf0c9f88 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -702,8 +702,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; - ret = sysfs_create_group(&mcbsp->dev->kobj, - &additional_attr_group); + ret = devm_device_add_group(mcbsp->dev, &additional_attr_group); if (ret) { dev_err(mcbsp->dev, "Unable to create additional controls\n"); @@ -711,16 +710,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) } } - ret = omap_mcbsp_st_init(pdev); - if (ret) - goto err_st; - - return 0; - -err_st: - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - return ret; + return omap_mcbsp_st_init(pdev); } /* @@ -1431,11 +1421,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - - omap_mcbsp_st_cleanup(pdev); - return 0; } -- 2.34.1

3 2

[PATCH v3] ASoC: ti: omap-mcbsp: duplicate sysfs error
by David Owens 27 Jun '22

27 Jun '22

Convert to managed versions of sysfs and clk allocation to simplify unbinding and error handling in probe. Managed sysfs node creation specifically addresses the following error seen the second time probe is attempted after sdma_pcm_platform_register() previously requested probe deferral: sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' Signed-off-by: David Owens <dowens(a)precisionplanting.com> --- Changes in v3: * Whitespace changes only to allow clean applly Changes in v2: * Improved error handling --- sound/soc/ti/omap-mcbsp-priv.h | 2 -- sound/soc/ti/omap-mcbsp-st.c | 21 ++++----------------- sound/soc/ti/omap-mcbsp.c | 26 ++++---------------------- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h index 7865cda4bf0a..da519ea1f303 100644 --- a/sound/soc/ti/omap-mcbsp-priv.h +++ b/sound/soc/ti/omap-mcbsp-priv.h @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, /* Sidetone specific API */ int omap_mcbsp_st_init(struct platform_device *pdev); -void omap_mcbsp_st_cleanup(struct platform_device *pdev); - int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index 0bc7d26c660a..402a57a502e6 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -292,14 +292,11 @@ static ssize_t st_taps_store(struct device *dev, static DEVICE_ATTR_RW(st_taps); -static const struct attribute *sidetone_attrs[] = { +static struct attribute *sidetone_attrs[] = { &dev_attr_st_taps.attr, NULL, }; - -static const struct attribute_group sidetone_attr_group = { - .attrs = (struct attribute **)sidetone_attrs, -}; +ATTRIBUTE_GROUPS(sidetone); int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp) { @@ -347,7 +344,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data) return -ENOMEM; - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); if (IS_ERR(st_data->mcbsp_iclk)) { dev_warn(mcbsp->dev, "Failed to get ick, sidetone might be broken\n"); @@ -359,7 +356,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data->io_base_st) return -ENOMEM; - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); + ret = devm_device_add_group(mcbsp->dev, &sidetone_group); if (ret) return ret; @@ -368,16 +365,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) return 0; } -void omap_mcbsp_st_cleanup(struct platform_device *pdev) -{ - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - - if (mcbsp->st_data) { - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); - clk_put(mcbsp->st_data->mcbsp_iclk); - } -} - static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 4479d74f0a45..395493a2d965 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -595,16 +595,13 @@ static ssize_t dma_op_mode_store(struct device *dev, static DEVICE_ATTR_RW(dma_op_mode); -static const struct attribute *additional_attrs[] = { +static struct attribute *additional_attrs[] = { &dev_attr_max_tx_thres.attr, &dev_attr_max_rx_thres.attr, &dev_attr_dma_op_mode.attr, NULL, }; - -static const struct attribute_group additional_attr_group = { - .attrs = (struct attribute **)additional_attrs, -}; +ATTRIBUTE_GROUPS(additional); /* * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. @@ -702,8 +699,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; - ret = sysfs_create_group(&mcbsp->dev->kobj, - &additional_attr_group); + ret = devm_device_add_group(mcbsp->dev, &additional_group); if (ret) { dev_err(mcbsp->dev, "Unable to create additional controls\n"); @@ -711,16 +707,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) } } - ret = omap_mcbsp_st_init(pdev); - if (ret) - goto err_st; - - return 0; - -err_st: - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - return ret; + return omap_mcbsp_st_init(pdev); } /* @@ -1431,11 +1418,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - - omap_mcbsp_st_cleanup(pdev); - return 0; } -- 2.34.1

4 6

Re: [PATCH v2] ASoC: ti: omap-mcbsp: duplicate sysfs error
by Mark Brown 27 Jun '22

27 Jun '22

On Wed, 15 Jun 2022 10:09:55 -0500, David Owens wrote: > Convert to managed versions of sysfs and clk allocation to simplify > unbinding and error handling in probe. Managed sysfs node > creation specifically addresses the following error seen the second time > probe is attempted after sdma_pcm_platform_register() previously requsted > probe deferral: > > sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: ti: omap-mcbsp: duplicate sysfs error commit: 6d31e225742a1955db8a0c6f6f52beb748a2895e All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH] drm: amd: amdgpu: fix checkpatch warnings
by Vijendar Mukunda 27 Jun '22

27 Jun '22

From: vijendar <vijendar.mukunda(a)amd.com> Fixed below checkpatch warnings and errors drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:131: CHECK: Comparison to NULL could be written "apd" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:150: CHECK: Comparison to NULL could be written "apd" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:196: CHECK: Prefer kernel type 'u64' over 'uint64_t' drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:224: CHECK: Please don't use multiple blank lines drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:226: CHECK: Comparison to NULL could be written "!adev->acp.acp_genpd" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:233: CHECK: Please don't use multiple blank lines drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:239: CHECK: Alignment should match open parenthesis drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:241: CHECK: Comparison to NULL could be written "!adev->acp.acp_cell" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:247: CHECK: Comparison to NULL could be written "!adev->acp.acp_res" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:253: CHECK: Comparison to NULL could be written "!i2s_pdata" drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:350: CHECK: Alignment should match open parenthesis drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:550: ERROR: that open brace { should be on the previous line Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 27 +++++++++---------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index cc9c9f8b23b2..ba1605ff521f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -128,7 +128,7 @@ static int acp_poweroff(struct generic_pm_domain *genpd) struct amdgpu_device *adev; apd = container_of(genpd, struct acp_pm_domain, gpd); - if (apd != NULL) { + if (apd) { adev = apd->adev; /* call smu to POWER GATE ACP block * smu will @@ -147,7 +147,7 @@ static int acp_poweron(struct generic_pm_domain *genpd) struct amdgpu_device *adev; apd = container_of(genpd, struct acp_pm_domain, gpd); - if (apd != NULL) { + if (apd) { adev = apd->adev; /* call smu to UNGATE ACP block * smu will @@ -193,7 +193,7 @@ static int acp_genpd_remove_device(struct device *dev, void *data) static int acp_hw_init(void *handle) { int r; - uint64_t acp_base; + u64 acp_base; u32 val = 0; u32 count = 0; struct i2s_platform_data *i2s_pdata = NULL; @@ -220,37 +220,32 @@ static int acp_hw_init(void *handle) return -EINVAL; acp_base = adev->rmmio_base; - - adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL); - if (adev->acp.acp_genpd == NULL) + if (!adev->acp.acp_genpd) return -ENOMEM; adev->acp.acp_genpd->gpd.name = "ACP_AUDIO"; adev->acp.acp_genpd->gpd.power_off = acp_poweroff; adev->acp.acp_genpd->gpd.power_on = acp_poweron; - - adev->acp.acp_genpd->adev = adev; pm_genpd_init(&adev->acp.acp_genpd->gpd, NULL, false); - adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell), - GFP_KERNEL); + adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell), GFP_KERNEL); - if (adev->acp.acp_cell == NULL) { + if (!adev->acp.acp_cell) { r = -ENOMEM; goto failure; } adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL); - if (adev->acp.acp_res == NULL) { + if (!adev->acp.acp_res) { r = -ENOMEM; goto failure; } i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL); - if (i2s_pdata == NULL) { + if (!i2s_pdata) { r = -ENOMEM; goto failure; } @@ -346,8 +341,7 @@ static int acp_hw_init(void *handle) adev->acp.acp_cell[3].platform_data = &i2s_pdata[2]; adev->acp.acp_cell[3].pdata_size = sizeof(struct i2s_platform_data); - r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell, - ACP_DEVS); + r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell, ACP_DEVS); if (r) goto failure; @@ -546,8 +540,7 @@ static const struct amd_ip_funcs acp_ip_funcs = { .set_powergating_state = acp_set_powergating_state, }; -const struct amdgpu_ip_block_version acp_ip_block = -{ +const struct amdgpu_ip_block_version acp_ip_block = { .type = AMD_IP_BLOCK_TYPE_ACP, .major = 2, .minor = 2, -- 2.25.1

2 2

Re: Sound not working after commit bbf7d3b1c4f40eb02dd1dffb500ba00b0bff0303 on Amlogic A311D device
by Pierre-Louis Bossart 27 Jun '22

27 Jun '22

[Adding alsa-devel] On 6/26/22 04:29, Alex Natalsson wrote: > Hello friends. > I have Khadas VIM3 SBC with Amlogic A311D SOC device. > After update kernel my media software (alsamixer, mplayer, ffplay and > etc.) not responding after launch and not terminating throught kill > -9. > > The log after alsamixer launch: > [ 103.786358] Internal error: Oops: 96000004 [#1] SMP > [ 103.786509] Modules linked in: snd_seq_dummy snd_hrtimer snd_seq > snd_seq_device bnep nls_utf8 mt7601u mac80211 hci_uart libarc4 joydev > brcmfmac btbcm panfrost bluetooth meson_vdec(C) brcmutil gpu_sched > cfg80211 dwmac_generic videobuf2_dma_contig v4l2_mem2mem > videobuf2_memops videobuf2_v4l2 videobuf2_common drm_shmem_helper > ecdh_generic dwmac_meson8b stmmac_platform dw_hdmi_i2s_audio stmmac > ecc ir_nec_decoder videodev pcs_xpcs rc_khadas phylink ptp > meson_saradc meson_ir rc_core snd_soc_meson_axg_frddr > snd_soc_meson_axg_toddr snd_soc_meson_axg_sound_card > snd_soc_meson_card_utils snd_soc_meson_axg_fifo ao_cec_g12a > snd_soc_meson_axg_tdmin snd_soc_meson_axg_tdm_interface > snd_soc_meson_axg_tdmout snd_soc_meson_axg_tdm_formatter rfkill > meson_gxbb_wdt fuse crypto_user uas usb_storage adc_keys > gpio_keys_polled industrialio > [ 103.857778] CPU: 3 PID: 530 Comm: pipewire-media- Tainted: G > C 5.16.0-ARCH+ #8 Any chance you could try with an updated kernel? It's not clear to me if this is a real issue or just a warning that's been fixed since by commit. bbf7d3b1c4f40 "ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks" You may also want to open a bugzilla issue to attach the full dmesg log and your configuration reported by 'alsa-info' > [ 103.857791] Hardware name: Khadas VIM3 (DT) > [ 103.857795] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) > [ 103.857801] pc : dpcm_be_connect+0xd0/0x2d0 > [ 103.881758] lr : dpcm_add_paths.isra.0+0xcc/0x1e0 > [ 103.881763] sp : ffff800009f4b870 > [ 103.881765] x29: ffff800009f4b870 x28: ffff000003b944c0 x27: 0000000000000001 > [ 103.881772] x26: 0000000000000001 x25: 0000000000000340 x24: 00000000000002a0 > [ 103.881777] x23: 0000000000000001 x22: 0000000000000000 x21: ffff000005b18080 > [ 103.881782] x20: ffff000005b183c0 x19: ffff000005b1c080 x18: 0000000000000000 > [ 103.881787] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 > [ 103.881792] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 > [ 103.881797] x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000 > [ 103.881801] x8 : ffff000012020400 x7 : 0000000000000000 x6 : 000000000000003f > [ 103.881806] x5 : 0000000000000040 x4 : 0000000000000000 x3 : ffff000002822000 > [ 103.881811] x2 : ffff000002861b50 x1 : ffff00000282f800 x0 : ffff000002861800 > [ 103.881817] Call trace: > [ 103.881819] dpcm_be_connect+0xd0/0x2d0 > [ 103.881823] dpcm_add_paths.isra.0+0xcc/0x1e0 > [ 103.881826] dpcm_fe_dai_open+0x80/0x194 > [ 103.881831] snd_pcm_open_substream+0xa4/0x174 > [ 103.881838] snd_pcm_open.part.0+0xd8/0x1dc > [ 103.881843] snd_pcm_capture_open+0x64/0x94 > [ 103.992730] snd_open+0xac/0x1d0 > [ 103.992739] chrdev_open+0xe0/0x2d0 > [ 103.999389] do_dentry_open+0x12c/0x3a0 > [ 103.999397] vfs_open+0x30/0x3c > [ 103.999401] do_open+0x204/0x414 > [ 103.999405] path_openat+0x10c/0x27c > [ 103.999408] do_filp_open+0x80/0x130 > [ 103.999412] do_sys_openat2+0xb4/0x170 > [ 103.999414] __arm64_sys_openat+0x64/0xb0 > [ 103.999416] invoke_syscall+0x48/0x114 > [ 103.999426] el0_svc_common.constprop.0+0xd4/0xfc > [ 103.999429] do_el0_svc+0x28/0x90 > [ 103.999432] el0_svc+0x28/0x80 > > After I removed pipewire software the error message was > disappear. But the sound and media still doesn't working and alsamixer > cannot change sound card to my usb audio device.

2 1