From nobody Wed Sep 10 02:20:56 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 56FDBC64ED6 for ; Tue, 28 Feb 2023 11:02:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231191AbjB1LCH (ORCPT ); Tue, 28 Feb 2023 06:02:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230478AbjB1LCE (ORCPT ); Tue, 28 Feb 2023 06:02:04 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07D1323C40; Tue, 28 Feb 2023 03:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1677582121; x=1709118121; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h/jiWEOZsffwI+IMKkal/xKUjU/a6RIroqiEYcdfC9s=; b=EXgeJ19vknG0ieCz2c7cltIPlJwIMGNcvkQd3mqlzJRTfd+dzZDVSOCh GfrP8abCqrtUIWwpwfKU1QQ7PRbVsXyY+AYNk0p9fY0sCdtohnnPw/W/C PUMv3iF/HbVZSy9AMCVlPtW8iK+EcVLTbkRkzFv1s1UJJSK9Q1Umf5AKU Voe1drPT0cFdgi5m9Y6/cIhuYK9icy+m+IPkWCsZJLogTN7+h50eusb68 EUidDPqT1otZTgLQaCdGqw31N7BEVCTuSo5sp1bkQ4A511F1A8yaSXuSJ WiJXbfBE9GVmqCdI9/f28LE3uIqV9WB+DlIRquiiI4YP4CU+DHNdati11 g==; X-IronPort-AV: E=Sophos;i="5.98,221,1673938800"; d="scan'208";a="213967735" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Feb 2023 04:02:01 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 28 Feb 2023 04:01:59 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 28 Feb 2023 04:01:54 -0700 From: Claudiu Beznea To: , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH v3 1/3] ASoC: soc-pcm: add option to start DMA after DAI Date: Tue, 28 Feb 2023 13:01:43 +0200 Message-ID: <20230228110145.3770525-2-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230228110145.3770525-1-claudiu.beznea@microchip.com> References: <20230228110145.3770525-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_soc_component_driver::start_dma_last. Signed-off-by: Claudiu Beznea --- include/sound/soc-component.h | 2 ++ sound/soc/soc-pcm.c | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) 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-pcm.c b/sound/soc/soc-pcm.c index 005b179a770a..5eb056b942ce 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 last? */ + 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 Wed Sep 10 02:20:56 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 9EADCC64ED6 for ; Tue, 28 Feb 2023 11:02:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231258AbjB1LCJ (ORCPT ); Tue, 28 Feb 2023 06:02:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231132AbjB1LCF (ORCPT ); Tue, 28 Feb 2023 06:02:05 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E1032CC4D; Tue, 28 Feb 2023 03:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1677582124; x=1709118124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M0BMjJ51501wpDWDJL+qs/Hg4DZbcQHuATRCbLu3HlY=; b=aKUiKLZSRZSnuQsYdNv3Dk2ICWIobD+FpybOBX3zxl/M8wTSyB8nvXnb DZoh3LfYjMImmA0lhuCaU03wTNLCkB8Mv0jFk2wn5jLKtr3UVe5iC2wcc CsN3BId8jbvqajiG/RJScPoM9DwD+8iQYMuDZQZGH44YeEwUbbKhJNOnv krCdKSCq4iwJqLfWIUnHSsZAEq7xe69SkYRxeFAA6c5ot3cQOP/SFM4mY WfY2fFDlMK9HcxlAUP3ispcaPIPWl75xzuWILUOz08yBpCCd/7KpKYi9Z aZX4IQDKPlR75K9rV3MVz9hK8VxsiEKEsrGV56n5UrqFN+Wi8ELtsuJAu Q==; X-IronPort-AV: E=Sophos;i="5.98,221,1673938800"; d="scan'208";a="213967752" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Feb 2023 04:02:03 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 28 Feb 2023 04:02:02 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 28 Feb 2023 04:01:59 -0700 From: Claudiu Beznea To: , , , , , , , CC: , , , , Claudiu Beznea , Krzysztof Kozlowski Subject: [PATCH v3 2/3] ASoC: dt-bindings: sama7g5-pdmc: add microchip,startup-delay-us binding Date: Tue, 28 Feb 2023 13:01:44 +0200 Message-ID: <20230228110145.3770525-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230228110145.3770525-1-claudiu.beznea@microchip.com> References: <20230228110145.3770525-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" PDMC can work with different types of microphones, thus different boards could have different microphones. Depending on microphone type the PDMC would need to wait longer or shorter period (at startup) than the default chosen one to filter unwanted noise. Thus 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 Wed Sep 10 02:20:56 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 57B4CC64ED6 for ; Tue, 28 Feb 2023 11:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231302AbjB1LCN (ORCPT ); Tue, 28 Feb 2023 06:02:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231241AbjB1LCL (ORCPT ); Tue, 28 Feb 2023 06:02:11 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA6B72ED6F; Tue, 28 Feb 2023 03:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1677582128; x=1709118128; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WWmp1hv/uFDxkm4wlpa8Jan2QxDmWX4YCWLpQI+K9BI=; b=0iwCUjUfwRZZDXDzVfFfTVBvskIaABSq5wPTVl94crQX431EmhSN4SeJ i4N4ep0/4qGd66LxhJ5MLcs/xtT49xA63EgAAhdyaqB82Gd/khMDfD5bS kgX4R0EPGIe3yjLTjjmYfEQrZtlIkrl/cs4CRv4Jqh0Df5bsonOqke+f+ vObEFVRnFmhWzafWEOZKXj341H4w6822rhHiExJZzT842e//Y/pglTdI3 bC7XJSeseBvxtqdi6cBdiP3uugvxkCvwlTKFiLn6CLnaMjGU9nmRPkUAK itE//0D6LMgDqIpTHF4fRx+5rmmfsCEzQIJ8jURgkZKqfB0dQWW6OaPgV A==; X-IronPort-AV: E=Sophos;i="5.98,221,1673938800"; d="scan'208";a="202762758" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Feb 2023 04:02:06 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) 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, 28 Feb 2023 04:02:06 -0700 Received: from m18063-ThinkPad-T460p.mchp-main.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 28 Feb 2023 04:02:03 -0700 From: Claudiu Beznea To: , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH v3 3/3] ASoC: mchp-pdmc: fix poc noise at capture startup Date: Tue, 28 Feb 2023 13:01:45 +0200 Message-ID: <20230228110145.3770525-4-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230228110145.3770525-1-claudiu.beznea@microchip.com> References: <20230228110145.3770525-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 | 53 +++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index cf4084dcbd5e..1aed3baa9369 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; @@ -425,6 +426,7 @@ static const struct snd_soc_component_driver mchp_pdmc_= dai_component =3D { .open =3D &mchp_pdmc_open, .close =3D &mchp_pdmc_close, .legacy_dai_naming =3D 1, + .start_dma_last =3D 1, }; =20 static const unsigned int mchp_pdmc_1mic[] =3D {1}; @@ -632,6 +634,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 +669,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 +823,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 +845,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 +875,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 +958,9 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dd->channel_mic_map[i].clk_edge =3D edge; } =20 + dd->startup_delay_us =3D 150000; + of_property_read_u32(np, "microchip,startup-delay-us", &dd->startup_delay= _us); + return 0; } =20 --=20 2.34.1