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

[PATCH][next] ALSA: opti9xx: fix missing { } around an if block
by Colin King 20 Jul '21

20 Jul '21

From: Colin Ian King <colin.king(a)canonical.com> Currently the { } braces are missing around an if block causing subsequent code after the return to become unreachable. Fix this by adding the missing { }. Addresses-Coverity: ("Structurally dead code") Fixes: 2973ee4a5b54 ("ALSA: opti9xx: Allocate resources with device-managed APIs") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 8988de8cca96..4beeb32fe2a7 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -1096,9 +1096,10 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, if (error) return error; error = snd_opti9xx_read_check(card, chip); - if (error) + if (error) { snd_printk(KERN_ERR "OPTI chip not found\n"); return error; + } error = snd_opti9xx_probe(card); if (error < 0) return error; -- 2.31.1

2 1

[PATCH -next] ALSA: nm256: Fix error return code in snd_nm256_create()
by Yang Yingliang 20 Jul '21

20 Jul '21

If pci_request_regions() fails, it should return error code in snd_nm256_create(). Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/pci/nm256/nm256.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index a54b9b26a0c2..c9c178504959 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -1478,7 +1478,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci) chip->buffer_addr = pci_resource_start(pci, 0); chip->cport_addr = pci_resource_start(pci, 1); - if (pci_request_regions(pci, card->driver)) + err = pci_request_regions(pci, card->driver); + if (err < 0) return err; /* Init the memory port info. */ -- 2.25.1

2 1

[PATCH] ALSA: pcm: Fix mmap without buffer preallocation
by Takashi Iwai 20 Jul '21

20 Jul '21

The recent rewrite of the memory allocation helpers also changed the page extraction to a common helper, snd_sgbuf_get_page(). But this assumes implicitly that the buffer was allocated via the standard helper (usually via preallocation), and didn't consider the case of the manual buffer handling. This patch fixes it and also covers the manual buffer management. Fixes: 37af81c5998f ("ALSA: core: Abstract memory alloc helpers") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_native.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 6919d2943b9d..6a2971a7e6a1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3675,6 +3675,8 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; if (substream->ops->page) page = substream->ops->page(substream, offset); + else if (!snd_pcm_get_dma_buf(substream)) + page = virt_to_page(runtime->dma_area + offset); else page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset); if (!page) -- 2.26.2

1 0

[PATCH] ALSA: hda: intel-dsp-cfg: add missing ElkhartLake PCI ID
by Pierre-Louis Bossart 20 Jul '21

20 Jul '21

We missed the fact that ElkhartLake platforms have two different PCI IDs. We only added one so the SOF driver is never selected by the autodetection logic for the missing configuration. BugLink: https://github.com/thesofproject/linux/issues/2990 Fixes: cc8f81c7e625 ('ALSA: hda: fix intel DSP config') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/hda/intel-dsp-config.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index d8be146793ee..c9d0ba353463 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -319,6 +319,10 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, .device = 0x4b55, }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, + .device = 0x4b58, + }, #endif /* Alder Lake */ -- 2.25.1

2 1

Re: [PATCH 1/2] slimbus: qcom-ngd-ctrl: add Sub System Restart support
by Yassine Oudjana 20 Jul '21

20 Jul '21

In-Reply-To: <20201118170246.16588-2-srinivas.kandagatla(a)linaro.org> On Wed, 18 Nov 2020 17:02:45 +0000, Srinivas Kandagatla wrote: > This patch adds SSR(SubSystem Restart) support which includes, synchronisation > between SSR and QMI server notifications. Also with this patch now NGD is taken > down by SSR instead of QMI server down notification. > > NGD up path now relies on both SSR and QMI notifications and particularly > sequence of SSR up followed by QMI server up notification. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> > --- > drivers/slimbus/Kconfig | 1 + > drivers/slimbus/qcom-ngd-ctrl.c | 97 +++++++++++++++++++++++++++++++-- > 2 files changed, 94 insertions(+), 4 deletions(-) > > diff --git a/drivers/slimbus/Kconfig b/drivers/slimbus/Kconfig > index 8cd595148d17..7c950948a9ec 100644 > --- a/drivers/slimbus/Kconfig > +++ b/drivers/slimbus/Kconfig > @@ -25,6 +25,7 @@ config SLIM_QCOM_NGD_CTRL > depends on HAS_IOMEM && DMA_ENGINE && NET > depends on ARCH_QCOM || COMPILE_TEST > select QCOM_QMI_HELPERS > + select QCOM_RPROC_COMMON > help > Select driver if Qualcomm's SLIMbus Satellite Non-Generic Device > Component is programmed using Linux kernel. > diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c > index 218aefc3531c..f62693653d2b 100644 > --- a/drivers/slimbus/qcom-ngd-ctrl.c > +++ b/drivers/slimbus/qcom-ngd-ctrl.c > @@ -13,6 +13,9 @@ > #include <linux/slimbus.h> > #include <linux/delay.h> > #include <linux/pm_runtime.h> > +#include <linux/mutex.h> > +#include <linux/notifier.h> > +#include <linux/remoteproc/qcom_rproc.h> > #include <linux/of.h> > #include <linux/io.h> > #include <linux/soc/qcom/qmi.h> > @@ -155,8 +158,14 @@ struct qcom_slim_ngd_ctrl { > struct qcom_slim_ngd_dma_desc txdesc[QCOM_SLIM_NGD_DESC_NUM]; > struct completion reconf; > struct work_struct m_work; > + struct work_struct ngd_up_work; > struct workqueue_struct *mwq; > + struct completion qmi_up; > spinlock_t tx_buf_lock; > + struct mutex tx_lock; > + struct mutex ssr_lock; > + struct notifier_block nb; > + void *notifier; > enum qcom_slim_ngd_state state; > dma_addr_t rx_phys_base; > dma_addr_t tx_phys_base; > @@ -868,14 +877,18 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl, > if (txn->msg && txn->msg->wbuf) > memcpy(puc, txn->msg->wbuf, txn->msg->num_bytes); > > + mutex_lock(&ctrl->tx_lock); > ret = qcom_slim_ngd_tx_msg_post(ctrl, pbuf, txn->rl); > - if (ret) > + if (ret) { > + mutex_unlock(&ctrl->tx_lock); > return ret; > + } > > timeout = wait_for_completion_timeout(&tx_sent, HZ); > if (!timeout) { > dev_err(sctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc, > txn->mt); > + mutex_unlock(&ctrl->tx_lock); > return -ETIMEDOUT; > } > > @@ -884,10 +897,12 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl, > if (!timeout) { > dev_err(sctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", > txn->mc, txn->mt); > + mutex_unlock(&ctrl->tx_lock); > return -ETIMEDOUT; > } > } > > + mutex_unlock(&ctrl->tx_lock); > return 0; > } > > @@ -1200,6 +1215,13 @@ static void qcom_slim_ngd_master_worker(struct work_struct *work) > } > } > > +static int qcom_slim_ngd_update_device_status(struct device *dev, void *null) > +{ > + slim_report_absent(to_slim_device(dev)); > + > + return 0; > +} > + > static int qcom_slim_ngd_runtime_resume(struct device *dev) > { > struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); > @@ -1267,7 +1289,7 @@ static int qcom_slim_ngd_qmi_new_server(struct qmi_handle *hdl, > qmi->svc_info.sq_node = service->node; > qmi->svc_info.sq_port = service->port; > > - qcom_slim_ngd_enable(ctrl, true); > + complete(&ctrl->qmi_up); > > return 0; > } > @@ -1280,10 +1302,9 @@ static void qcom_slim_ngd_qmi_del_server(struct qmi_handle *hdl, > struct qcom_slim_ngd_ctrl *ctrl = > container_of(qmi, struct qcom_slim_ngd_ctrl, qmi); > > + reinit_completion(&ctrl->qmi_up); > qmi->svc_info.sq_node = 0; > qmi->svc_info.sq_port = 0; > - > - qcom_slim_ngd_enable(ctrl, false); > } > > static struct qmi_ops qcom_slim_ngd_qmi_svc_event_ops = { > @@ -1333,6 +1354,64 @@ static const struct of_device_id qcom_slim_ngd_dt_match[] = { > > MODULE_DEVICE_TABLE(of, qcom_slim_ngd_dt_match); > > +static void qcom_slim_ngd_down(struct qcom_slim_ngd_ctrl *ctrl) > +{ > + mutex_lock(&ctrl->ssr_lock); > + device_for_each_child(ctrl->ctrl.dev, NULL, > + qcom_slim_ngd_update_device_status); > + qcom_slim_ngd_enable(ctrl, false); > + mutex_unlock(&ctrl->ssr_lock); > +} > + > +static void qcom_slim_ngd_up_worker(struct work_struct *work) > +{ > + struct qcom_slim_ngd_ctrl *ctrl; > + > + ctrl = container_of(work, struct qcom_slim_ngd_ctrl, ngd_up_work); > + > + /* Make sure qmi service is up before continuing */ > + wait_for_completion_interruptible(&ctrl->qmi_up); > + > + mutex_lock(&ctrl->ssr_lock); > + qcom_slim_ngd_enable(ctrl, true); > + mutex_unlock(&ctrl->ssr_lock); > +} > + > +static int qcom_slim_ngd_ssr_pdr_notify(struct qcom_slim_ngd_ctrl *ctrl, > + unsigned long action) > +{ > + switch (action) { > + case QCOM_SSR_BEFORE_SHUTDOWN: > + /* Make sure the last dma xfer is finished */ > + mutex_lock(&ctrl->tx_lock); > + if (ctrl->state != QCOM_SLIM_NGD_CTRL_DOWN) { > + pm_runtime_get_noresume(ctrl->dev); > + ctrl->state = QCOM_SLIM_NGD_CTRL_DOWN; > + qcom_slim_ngd_down(ctrl); > + qcom_slim_ngd_exit_dma(ctrl); > + } > + mutex_unlock(&ctrl->tx_lock); > + break; > + case QCOM_SSR_AFTER_POWERUP: > + schedule_work(&ctrl->ngd_up_work); > + break; > + default: > + break; > + } > + > + return NOTIFY_OK; > +} > + > +static int qcom_slim_ngd_ssr_notify(struct notifier_block *nb, > + unsigned long action, > + void *data) > +{ > + struct qcom_slim_ngd_ctrl *ctrl = container_of(nb, > + struct qcom_slim_ngd_ctrl, nb); > + > + return qcom_slim_ngd_ssr_pdr_notify(ctrl, action); > +} > + > static int of_qcom_slim_ngd_register(struct device *parent, > struct qcom_slim_ngd_ctrl *ctrl) > { > @@ -1397,6 +1476,7 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) > } > > INIT_WORK(&ctrl->m_work, qcom_slim_ngd_master_worker); > + INIT_WORK(&ctrl->ngd_up_work, qcom_slim_ngd_up_worker); > ctrl->mwq = create_singlethread_workqueue("ngd_master"); > if (!ctrl->mwq) { > dev_err(&pdev->dev, "Failed to start master worker\n"); > @@ -1444,6 +1524,11 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) > return ret; > } > > + ctrl->nb.notifier_call = qcom_slim_ngd_ssr_notify; > + ctrl->notifier = qcom_register_ssr_notifier("lpass", &ctrl->nb); > + if (IS_ERR(ctrl->notifier)) > + return PTR_ERR(ctrl->notifier); > + > ctrl->dev = dev; > ctrl->framer.rootfreq = SLIM_ROOT_FREQ >> 3; > ctrl->framer.superfreq = > @@ -1457,9 +1542,12 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) > ctrl->ctrl.wakeup = NULL; > ctrl->state = QCOM_SLIM_NGD_CTRL_DOWN; > > + mutex_init(&ctrl->tx_lock); > + mutex_init(&ctrl->ssr_lock); > spin_lock_init(&ctrl->tx_buf_lock); > init_completion(&ctrl->reconf); > init_completion(&ctrl->qmi.qmi_comp); > + init_completion(&ctrl->qmi_up); > > platform_driver_register(&qcom_slim_ngd_driver); > return of_qcom_slim_ngd_register(dev, ctrl); > @@ -1477,6 +1565,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) > struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); > > pm_runtime_disable(&pdev->dev); > + qcom_unregister_ssr_notifier(ctrl->notifier, &ctrl->nb); > qcom_slim_ngd_enable(ctrl, false); > qcom_slim_ngd_exit_dma(ctrl); > qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); > -- > 2.21.0 This makes NGD never come up if probed after ADSP is powered on since it registers its SSR notifier after ADSP sent its after powerup notification.

1 0

[PATCH V3 00/12] Add Vangogh ACP ASoC driver
by Vijendar Mukunda 19 Jul '21

19 Jul '21

This adds an ASoC driver for the ACP (Audio CoProcessor) block on AMD Vangogh APU. Changes since v2: - remove extra stuff from Make file Changes since v1: - add comment for acp_readl() & acp_writel() API's in common header file. - add amd: tag in commit message - modify condition check in acp5x_power_on() - removed acp_power_gating flag related code - drop acp5x_audio_remove() API - use single flag for handling irq status - fixed indetation issue and used dev_err instead of pr_err - drop acp5x_dai_remove() API - use SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK - use PM related Macros in ACP PCI driver - use PM related Macros in ACP DMA driver - remove extra line in Make file Vijendar Mukunda (12): ASoC: amd: add Vangogh ACP5x IP register header ASoC: amd: add Vangogh ACP PCI driver ASoc: amd: add acp5x init/de-init functions ASoC: amd: create acp5x platform devices ASoC: amd: add ACP5x PCM platform driver ASoC: amd: irq handler changes for ACP5x PCM dma driver ASoC: amd: add ACP5x pcm dma driver ops ASoC: amd: add vangogh i2s controller driver ASoC: amd: add vangogh i2s dai driver ops ASoC: amd: add vangogh pci driver pm ops ASoC: amd: add vangogh i2s dma driver pm ops ASoC: amd: enable vangogh acp5x driver build sound/soc/amd/Kconfig | 9 + sound/soc/amd/Makefile | 1 + sound/soc/amd/vangogh/Makefile | 9 + sound/soc/amd/vangogh/acp5x-i2s.c | 429 ++++++++++++++++ sound/soc/amd/vangogh/acp5x-pcm-dma.c | 525 ++++++++++++++++++++ sound/soc/amd/vangogh/acp5x.h | 192 +++++++ sound/soc/amd/vangogh/pci-acp5x.c | 327 ++++++++++++ sound/soc/amd/vangogh/vg_chip_offset_byte.h | 337 +++++++++++++ 8 files changed, 1829 insertions(+) create mode 100644 sound/soc/amd/vangogh/Makefile create mode 100644 sound/soc/amd/vangogh/acp5x-i2s.c create mode 100644 sound/soc/amd/vangogh/acp5x-pcm-dma.c create mode 100644 sound/soc/amd/vangogh/acp5x.h create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c create mode 100644 sound/soc/amd/vangogh/vg_chip_offset_byte.h -- 2.17.1

3 20

[PATCH 0/3] ASoC: ti: j721e-evm: Small fixes and code cleanup
by Peter Ujfalusi 19 Jul '21

19 Jul '21

Hi, I have found two issues with the machine driver which for some reason did not caused errors but they are certainly bugs. The last patch is just to convert the IDs from define to enum. Regards, Peter --- Peter Ujfalusi (3): ASoC: ti: j721e-evm: Fix unbalanced domain activity tracking during startup ASoC: ti: j721e-evm: Check for not initialized parent_clk_id ASoC: ti: j721e-evm: Convert the audio domain IDs to enum sound/soc/ti/j721e-evm.c | 48 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) -- 2.32.0

2 5

[PATCH RESEND V2 00/12] Add Vangogh ACP ASoC driver
by Vijendar Mukunda 19 Jul '21

19 Jul '21

This adds an ASoC driver for the ACP (Audio CoProcessor) block on AMD Vangogh APU. Vijendar Mukunda (12): ASoC: amd: add Vangogh ACP5x IP register header ASoC: amd: add Vangogh ACP PCI driver ASoc: amd: add acp5x init/de-init functions ASoC: amd: create acp5x platform devices ASoC: amd: add ACP5x PCM platform driver ASoC: amd: irq handler changes for ACP5x PCM dma driver ASoC: amd: add ACP5x pcm dma driver ops ASoC: amd: add vangogh i2s controller driver ASoC: amd: add vangogh i2s dai driver ops ASoC: amd: add vangogh pci driver pm ops ASoC: amd: add vangogh i2s dma driver pm ops ASoC: amd: enable vangogh acp5x driver build --- v1 -> v2: fixed review comments --- sound/soc/amd/Kconfig | 9 + sound/soc/amd/Makefile | 1 + sound/soc/amd/vangogh/Makefile | 9 + sound/soc/amd/vangogh/acp5x-i2s.c | 429 ++++++++++++++++ sound/soc/amd/vangogh/acp5x-pcm-dma.c | 525 ++++++++++++++++++++ sound/soc/amd/vangogh/acp5x.h | 192 +++++++ sound/soc/amd/vangogh/pci-acp5x.c | 327 ++++++++++++ sound/soc/amd/vangogh/vg_chip_offset_byte.h | 337 +++++++++++++ 8 files changed, 1829 insertions(+) create mode 100644 sound/soc/amd/vangogh/Makefile create mode 100644 sound/soc/amd/vangogh/acp5x-i2s.c create mode 100644 sound/soc/amd/vangogh/acp5x-pcm-dma.c create mode 100644 sound/soc/amd/vangogh/acp5x.h create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c create mode 100644 sound/soc/amd/vangogh/vg_chip_offset_byte.h -- 2.25.1

4 16

[PATCH] sound: Fix spelling mistake "synchronization" -> "synchronization"
by Colin King 19 Jul '21

19 Jul '21

From: Colin Ian King <colin.king(a)canonical.com> There is a spelling mistake in the Kconfig text. Fix it. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/drivers/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index 7141f73cddd3..ca4cdf666f82 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig @@ -102,7 +102,7 @@ config SND_ALOOP configured number of substreams (see the pcm_substreams module parameter). - The loopback device allows time sychronization with an external + The loopback device allows time synchronization with an external timing source using the time shift universal control (+-20% of system time). -- 2.31.1

2 1

Re: [PATCH 1/9] ASoC: dt-bindings: Document RZ/G2L bindings
by Rob Herring 19 Jul '21

19 Jul '21

On Fri, Jul 2, 2021 at 7:50 AM Biju Das <biju.das.jz(a)bp.renesas.com> wrote: > > Document RZ/G2L ASoC serial sound interface bindings. > > Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> > --- > Note:- This patch has dependency on #include <dt-bindings/clock/r9a07g044-cpg.h> file which will be in > next 5.14-rc1 release That kind of means you should wait and send this once v5.14-rc1 is released as it is the merge window currently. Rob

2 1