From nobody Fri Sep 12 01:05:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2622C05027 for ; Tue, 14 Feb 2023 16:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232176AbjBNQRI (ORCPT ); Tue, 14 Feb 2023 11:17:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232062AbjBNQRE (ORCPT ); Tue, 14 Feb 2023 11:17:04 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C002F20051; Tue, 14 Feb 2023 08:17:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1676391421; x=1707927421; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2i+DTZuHLMmNkyjv/Ro4aJ2pGv9HHR2Ky3DwJ9SA03Y=; b=BAOF8DByM65dVCgscQDeWoFfvvsvx33VLBu3SeeGivlDMAZwNf/HC3bs 3j1/2Od3rbmRnWen6HTL2lko4zaeTobeNd9YA2ZqH5uuktAVIDf52pRvw CRpU6nhLxfmdTr0PqNXFKoVx+75uJo1Nm17OJj7Vyb7mQvthQyXXU9IXI ij/j/eSefAkK1OaeiaEZrAUvtCte/gYxe+91Ym7dGYxv7CMAg1wVwLweZ btCAhD4qz+irpvvW0Z4H+9YVIOdAYmzLSc0GuUTFFrZdMT3d7OX5HVP4d ylUY3oIT9g5jux3RY0+Itfcvb4RrYWBvsKD2mkg4gpDp+Aj3tgBtDW6lo Q==; X-IronPort-AV: E=Sophos;i="5.97,297,1669100400"; d="scan'208";a="196891398" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Feb 2023 09:17:00 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 14 Feb 2023 09:16:58 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 09:16:54 -0700 From: Claudiu Beznea To: , , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH 1/3] ASoC: soc-generic-dmaengine-pcm: add option to start DMA after DAI Date: Tue, 14 Feb 2023 18:14:33 +0200 Message-ID: <20230214161435.1088246-2-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214161435.1088246-1-claudiu.beznea@microchip.com> References: <20230214161435.1088246-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add option to start DMA component after DAI trigger. This is done by filling the new struct snd_dmaengine_pcm_config::start_dma_last. Signed-off-by: Claudiu Beznea --- include/sound/dmaengine_pcm.h | 1 + include/sound/soc-component.h | 2 ++ sound/soc/soc-generic-dmaengine-pcm.c | 8 +++++--- sound/soc/soc-pcm.c | 27 ++++++++++++++++++++++----- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 2df54cf02cb3..4e3dcb94576d 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -149,6 +149,7 @@ struct snd_dmaengine_pcm_config { =20 const struct snd_pcm_hardware *pcm_hardware; unsigned int prealloc_buffer_size; + unsigned int start_dma_last; }; =20 int snd_dmaengine_pcm_register(struct device *dev, diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 3203d35bc8c1..0814ed143864 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -190,6 +190,8 @@ struct snd_soc_component_driver { bool use_dai_pcm_id; /* use DAI link PCM ID as PCM device number */ int be_pcm_base; /* base device ID for all BE PCMs */ =20 + unsigned int start_dma_last; + #ifdef CONFIG_DEBUG_FS const char *debugfs_prefix; #endif diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-= dmaengine-pcm.c index 3b99f619e37e..264e87af6b58 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -318,7 +318,7 @@ static int dmaengine_copy_user(struct snd_soc_component= *component, return 0; } =20 -static const struct snd_soc_component_driver dmaengine_pcm_component =3D { +static struct snd_soc_component_driver dmaengine_pcm_component =3D { .name =3D SND_DMAENGINE_PCM_DRV_NAME, .probe_order =3D SND_SOC_COMP_ORDER_LATE, .open =3D dmaengine_pcm_open, @@ -329,7 +329,7 @@ static const struct snd_soc_component_driver dmaengine_= pcm_component =3D { .pcm_construct =3D dmaengine_pcm_new, }; =20 -static const struct snd_soc_component_driver dmaengine_pcm_component_proce= ss =3D { +static struct snd_soc_component_driver dmaengine_pcm_component_process =3D= { .name =3D SND_DMAENGINE_PCM_DRV_NAME, .probe_order =3D SND_SOC_COMP_ORDER_LATE, .open =3D dmaengine_pcm_open, @@ -425,7 +425,7 @@ static const struct snd_dmaengine_pcm_config snd_dmaeng= ine_pcm_default_config =3D int snd_dmaengine_pcm_register(struct device *dev, const struct snd_dmaengine_pcm_config *config, unsigned int flags) { - const struct snd_soc_component_driver *driver; + struct snd_soc_component_driver *driver; struct dmaengine_pcm *pcm; int ret; =20 @@ -450,6 +450,8 @@ int snd_dmaengine_pcm_register(struct device *dev, else driver =3D &dmaengine_pcm_component; =20 + driver->start_dma_last =3D config->start_dma_last; + ret =3D snd_soc_component_initialize(&pcm->component, driver, dev); if (ret) goto err_free_dma; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 005b179a770a..ec429b93a4ee 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1088,22 +1088,39 @@ static int soc_pcm_hw_params(struct snd_pcm_substre= am *substream, static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_soc_pcm_runtime *rtd =3D asoc_substream_to_rtd(substream); - int ret =3D -EINVAL, _ret =3D 0; + struct snd_soc_component *component; + int ret =3D -EINVAL, _ret =3D 0, start_dma_last =3D 0, i; int rollback =3D 0; =20 switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + /* Do we need to start dma first? */ + for_each_rtd_components(rtd, i, component) { + if (component->driver->start_dma_last) { + start_dma_last =3D 1; + break; + } + } + ret =3D snd_soc_link_trigger(substream, cmd, 0); if (ret < 0) goto start_err; =20 - ret =3D snd_soc_pcm_component_trigger(substream, cmd, 0); - if (ret < 0) - goto start_err; + if (start_dma_last) { + ret =3D snd_soc_pcm_dai_trigger(substream, cmd, 0); + if (ret < 0) + goto start_err; + + ret =3D snd_soc_pcm_component_trigger(substream, cmd, 0); + } else { + ret =3D snd_soc_pcm_component_trigger(substream, cmd, 0); + if (ret < 0) + goto start_err; =20 - ret =3D snd_soc_pcm_dai_trigger(substream, cmd, 0); + ret =3D snd_soc_pcm_dai_trigger(substream, cmd, 0); + } start_err: if (ret < 0) rollback =3D 1; --=20 2.34.1 From nobody Fri Sep 12 01:05:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D423C61DA4 for ; Tue, 14 Feb 2023 16:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232197AbjBNQRP (ORCPT ); Tue, 14 Feb 2023 11:17:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232007AbjBNQRF (ORCPT ); Tue, 14 Feb 2023 11:17:05 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EED51F5F0; Tue, 14 Feb 2023 08:17:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1676391423; x=1707927423; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VchhvhX3Fzn+lpKQ+32W3d8wPFXXJZL6OWRPzobNePE=; b=w3oY8zjLcaVewfoDJh8j1G8GJnr+/yAl6FxxzIdfJwT9PPgueyDfY0k0 lI32DDfttIUjN792+RmQBnMZFaS64b2isPgs4HBdI35tj1SmL3WziPSp4 rh3zDIA1y1ZVldYvqDa0foqZS9gimXLp6ciDuKG8GdJ6y+cSBJBH21ops SRiBjaA4cSTFG+C237mUt9Tt1OWfzAb3dJzYiu6ui2Gh8FRh1hN0RuCGp /Q9vDLMWaMPRBkUEn7zpKgeLC30q/nil8noEPLCdvL4f8rRz2CBEvZtWm pVeHnkZbpLGLl8vMgn9h94B9pVWESl26+AFbhax1MNGg41pNali6Ut11f g==; X-IronPort-AV: E=Sophos;i="5.97,297,1669100400"; d="scan'208";a="137145391" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Feb 2023 09:17:02 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 14 Feb 2023 09:17:03 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 09:16:58 -0700 From: Claudiu Beznea To: , , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH 2/3] ASoC: dt-bindings: sama7g5-pdmc: add microchip,startup-delay-us binding Date: Tue, 14 Feb 2023 18:14:34 +0200 Message-ID: <20230214161435.1088246-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214161435.1088246-1-claudiu.beznea@microchip.com> References: <20230214161435.1088246-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add microchip,startup-delay-us binding to let PDMC users to specify startup delay. Signed-off-by: Claudiu Beznea Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc= .yaml b/Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml index c4cf1e5ab84b..9b40268537cb 100644 --- a/Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml +++ b/Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml @@ -67,6 +67,12 @@ properties: maxItems: 4 uniqueItems: true =20 + microchip,startup-delay-us: + description: | + Specifies the delay in microseconds that needs to be applied after + enabling the PDMC microphones to avoid unwanted noise due to microph= ones + not being ready. + required: - compatible - reg --=20 2.34.1 From nobody Fri Sep 12 01:05:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3044C05027 for ; Tue, 14 Feb 2023 16:17:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229513AbjBNQRs (ORCPT ); Tue, 14 Feb 2023 11:17:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232342AbjBNQRh (ORCPT ); Tue, 14 Feb 2023 11:17:37 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6223C2B0A6; Tue, 14 Feb 2023 08:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1676391440; x=1707927440; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uALPcs3Vx7BPrxo0UgAKw4uy0dcv8BW3De7tw3ZgiME=; b=t4JY7/upbIvwslGvqbQW4m3Qpt3zwsXYc8F9FpbCYchlAnvmn0CSK9lX wVVjWViWUxge5nq2D+DvCKPw9ZYdD4+RhwrYtjcYQpXYA6E1bQ70/msqc PTj3DwPaaccH6mZJLaOfM8rAL4v/wBOz2Mu/4LESwIKgRD2TJ2PBuu9DQ FtP3amgOBggEQ7EFt8/pfWU+6JxCRkZTbEtbd1kbMSJyQLoLO2e5Fc4cS zjz8I0zzgQYqcw5K78acXC6iGrMv8nYEHDDvovVEbdcNXi2V0Tvh1Svgl UvISJ9Muf+Izoi3AyE5cCUVF0/2WP2cnsqWTcuWrVyJopRScwoj6h8txP A==; X-IronPort-AV: E=Sophos;i="5.97,297,1669100400"; d="scan'208";a="196891478" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Feb 2023 09:17:19 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 14 Feb 2023 09:17:07 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 09:17:03 -0700 From: Claudiu Beznea To: , , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH 3/3] ASoC: mchp-pdmc: fix poc noise at capture startup Date: Tue, 14 Feb 2023 18:14:35 +0200 Message-ID: <20230214161435.1088246-4-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214161435.1088246-1-claudiu.beznea@microchip.com> References: <20230214161435.1088246-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Microchip PDMC IP doesn't filter microphone noises on startup. By default, it captures data received from digital microphones after the MCHP_PDMC_MR.EN bits are set. Thus when enable is set on PDMC side the digital microphones might not be ready yet and PDMC captures data from then in this time. This data captured is poc noise. To avoid this the software workaround is to the following: 1/ enable PDMC channel 2/ wait 150ms (on SAMA7G5-EK setup) 3/ execute 16 dummy reads from RHR 4/ clear interrupts 5/ enable interrupts 6/ enable DMA channel Fixes: 50291652af52 ("ASoC: atmel: mchp-pdmc: add PDMC driver") Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-pdmc.c | 55 +++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index cf4084dcbd5e..c5f597ebfa47 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -114,6 +114,7 @@ struct mchp_pdmc { struct clk *gclk; u32 pdmcen; u32 suspend_irq; + u32 startup_delay_us; int mic_no; int sinc_order; bool audio_filter_en; @@ -632,6 +633,29 @@ static int mchp_pdmc_hw_params(struct snd_pcm_substrea= m *substream, return 0; } =20 +static void mchp_pdmc_noise_filter_workaround(struct mchp_pdmc *dd) +{ + u32 tmp, steps =3D 16; + + /* + * PDMC doesn't wait for microphones' startup time thus the acquisition + * may start before the microphones are ready leading to poc noises at + * the beginning of capture. To avoid this, we need to wait 50ms (in + * normal startup procedure) or 150 ms (worst case after resume from sleep + * states) after microphones are enabled and then clear the FIFOs (by + * reading the RHR 16 times) and possible interrupts before continuing. + * Also, for this to work the DMA needs to be started after interrupts + * are enabled. + */ + usleep_range(dd->startup_delay_us, dd->startup_delay_us + 5); + + while (steps--) + regmap_read(dd->regmap, MCHP_PDMC_RHR, &tmp); + + /* Clear interrupts. */ + regmap_read(dd->regmap, MCHP_PDMC_ISR, &tmp); +} + static int mchp_pdmc_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { @@ -644,15 +668,17 @@ static int mchp_pdmc_trigger(struct snd_pcm_substream= *substream, switch (cmd) { case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_START: - /* Enable overrun and underrun error interrupts */ - regmap_write(dd->regmap, MCHP_PDMC_IER, dd->suspend_irq | - MCHP_PDMC_IR_RXOVR | MCHP_PDMC_IR_RXUDR); - dd->suspend_irq =3D 0; - fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: snd_soc_component_update_bits(cpu, MCHP_PDMC_MR, MCHP_PDMC_MR_PDMCEN_MASK, dd->pdmcen); + + mchp_pdmc_noise_filter_workaround(dd); + + /* Enable interrupts. */ + regmap_write(dd->regmap, MCHP_PDMC_IER, dd->suspend_irq | + MCHP_PDMC_IR_RXOVR | MCHP_PDMC_IR_RXUDR); + dd->suspend_irq =3D 0; break; case SNDRV_PCM_TRIGGER_SUSPEND: regmap_read(dd->regmap, MCHP_PDMC_IMR, &dd->suspend_irq); @@ -796,6 +822,7 @@ static bool mchp_pdmc_readable_reg(struct device *dev, = unsigned int reg) case MCHP_PDMC_CFGR: case MCHP_PDMC_IMR: case MCHP_PDMC_ISR: + case MCHP_PDMC_RHR: case MCHP_PDMC_VER: return true; default: @@ -817,6 +844,17 @@ static bool mchp_pdmc_writeable_reg(struct device *dev= , unsigned int reg) } } =20 +static bool mchp_pdmc_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MCHP_PDMC_ISR: + case MCHP_PDMC_RHR: + return true; + default: + return false; + } +} + static bool mchp_pdmc_precious_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -836,6 +874,7 @@ static const struct regmap_config mchp_pdmc_regmap_conf= ig =3D { .readable_reg =3D mchp_pdmc_readable_reg, .writeable_reg =3D mchp_pdmc_writeable_reg, .precious_reg =3D mchp_pdmc_precious_reg, + .volatile_reg =3D mchp_pdmc_volatile_reg, .cache_type =3D REGCACHE_FLAT, }; =20 @@ -918,6 +957,11 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dd->channel_mic_map[i].clk_edge =3D edge; } =20 + ret =3D of_property_read_u32(np, "microchip,startup-delay-us", + &dd->startup_delay_us); + if (ret) + dd->startup_delay_us =3D 150000; + return 0; } =20 @@ -941,6 +985,7 @@ static int mchp_pdmc_process(struct snd_pcm_substream *= substream, static struct snd_dmaengine_pcm_config mchp_pdmc_config =3D { .process =3D mchp_pdmc_process, .prepare_slave_config =3D snd_dmaengine_pcm_prepare_slave_config, + .start_dma_last =3D 1, }; =20 static int mchp_pdmc_runtime_suspend(struct device *dev) --=20 2.34.1