From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.93 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793833192; b=zFyMR/A1WuK+NLdno2OX1Aj/1NKsnIDgKm3PO5T19cHk10S0KQzjy9dLt1zaEn5h6tyJ ZznyUCdNcOtYFIAvoCzBEzV69IYpVHDjKqsgs+/OzMCBBM9fLTKaEMJ4wFq+gdWwGNj0J VC35FOo1bJWP3+/tdSxkdVS6BexUTjOESBIL3tJBNSVzi45fVJROXbsPUXK6R807ZeAOn +VBAnmVnVFpl1jD5h4kj/+mqeX6slWbPRxd2KuT4x56080kXdvRjliUvopDSxolTV5E0U gFGIt6rTSSvBYL7OTsUrflt2yQ5c3LGpCoUSnk4AiH5a2Gtvv/03DFs2HqPNS/TFGQA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793833192; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=vUNLGtDdsHlYpliyA09tTUGCYAIEIzLih8v8Bkz67Ms=; b=0DRfhPdh6tCGGNfY7S5uppUWWO2a94jpX+zHvWAea5NYR2WqmjFEWRXm2tI5Htksmbyz xipYX/5jsCzxky7Zc/nEbYDeRivONJS42gJSacVRXkASdauMenwppwyCnbcOc9B1tojbq UA5d96M5JMrT56kJHBVa54jiP0WN4cz6lWoDUbf8rqiC4P6zIpJ9otgjsKgo8yE4M72IV tlAK9sSTPYsVRXR0knyBP4kcVDdOxh9SJlFZAtKAzDvawiuyzCTnS6wXTKHdfdsiHbg9P 7OKGBgL/0JtTYkZb3pYdQ1wvFeiei0Rv8pVGDB9h1Z6Tb5hzcjKoKFBxNwoc8C9+NiQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=fXygBPxC; arc=none smtp.remote-ip=95.215.58.93 Received: from mta1.migadu.com (out-93.mta1.migadu.com [95.215.58.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A00E4606A332 for ; Wed, 4 Nov 2026 22:59:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A00E4606A332 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=fXygBPxC X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=jLxK4vjlIBxtVsOqhr1kAmXlBsz9dYDdk3bbnXg090k=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793833189; v=1; x=1794437989; b=fXygBPxCUYtvDQRZTBpVk+SJnYC0vUp/nqc1fXrAnxbGTpsIJ2J3tSKw/Jgv5fWjW2gNaT9A bpUOG6zWolGO5RXHv47HwgJYVsCtIpN/ZSygbDMqZSdI17JC1LxZf17QgBbBSgjAZZvfZq7buWb 1HORf32pwoRUt7svcfQeNzOs= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 5e6ba12e9dcbbbc4; Wed, 04 Nov 2026 22:59:49 +0000 X-Mizu-Trace-ID: 5e6ba12e9dcbbbc4 X-Migadu-Flow: FLOW_OUT From: Matthew Schwartz To: broonie@kernel.org Cc: Matthew Schwartz , Pierre-Louis Bossart , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Oder Chiou , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] ASoC: rt721-sdca: wait for PDEs to reach PS0 after powering them up Date: Wed, 4 Nov 2026 14:58:03 -0800 Message-ID: <20261104225803.1574849-5-matthew.schwartz@linux.dev> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104225803.1574849-1-matthew.schwartz@linux.dev> References: <20261104225803.1574849-1-matthew.schwartz@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The PDE event handlers write REQUESTED_PS and return, so DAPM unmutes the feature unit and the stream starts while the power domain is still transitioning. On the ASUS ROG Xbox Ally X20 the first headset mic capture after the capture path powers down starts with about 0.45 s pinned at full scale, and the DisCo tables give the jack function PDEs up to 500 ms to reach PS0. Poll ACTUAL_PS with sdca_asoc_pde_poll_actual_ps() after each power up, like rt722 does since its DMIC pop noise fix, and use the 500 ms maximum for the jack function PDEs. Power down is left alone because ACTUAL_PS can stay at PS0 while the data port is still running. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Matthew Schwartz --- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/rt721-sdca-sdw.c | 17 ++++++++++++++++ sound/soc/codecs/rt721-sdca.c | 33 +++++++++++++++++++++++++++++++ sound/soc/codecs/rt721-sdca.h | 1 + 4 files changed, 52 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index ba59dabeeccde..133f397cc6e96 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1978,6 +1978,7 @@ config SND_SOC_RT712_SDCA_DMIC_SDW config SND_SOC_RT721_SDCA_SDW tristate "Realtek RT721 SDCA Codec - SDW" depends on SOUNDWIRE + depends on SND_SOC_SDCA select REGMAP_SOUNDWIRE select REGMAP_SOUNDWIRE_MBQ diff --git a/sound/soc/codecs/rt721-sdca-sdw.c b/sound/soc/codecs/rt721-sdca-sdw.c index fc34a0537d5fb..44cf9ca866c94 100644 --- a/sound/soc/codecs/rt721-sdca-sdw.c +++ b/sound/soc/codecs/rt721-sdca-sdw.c @@ -39,6 +39,14 @@ static bool rt721_sdca_readable_register(struct device *dev, unsigned int reg) RT721_SDCA_CTL_HIDTX_CURRENT_OWNER, 0) ... SDW_SDCA_CTL(FUNC_NUM_HID, RT721_SDCA_ENT_HID01, RT721_SDCA_CTL_HIDTX_MESSAGE_LENGTH, 0): case RT721_BUF_ADDR_HID1 ... RT721_BUF_ADDR_HID2: + case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE12, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE40, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT721_SDCA_ENT_PDE2A, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_AMP, RT721_SDCA_ENT_PDE41, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): case SDW_SDCA_CTL(FUNC_NUM_AMP, RT721_SDCA_ENT0, RT721_SDCA_CTL_FUNC_STATUS, 0): return true; @@ -64,6 +72,14 @@ static bool rt721_sdca_volatile_register(struct device *dev, unsigned int reg) RT721_SDCA_CTL_HIDTX_CURRENT_OWNER, 0) ... SDW_SDCA_CTL(FUNC_NUM_HID, RT721_SDCA_ENT_HID01, RT721_SDCA_CTL_HIDTX_MESSAGE_LENGTH, 0): case RT721_BUF_ADDR_HID1 ... RT721_BUF_ADDR_HID2: + case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE12, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE40, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT721_SDCA_ENT_PDE2A, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_AMP, RT721_SDCA_ENT_PDE41, + RT721_SDCA_CTL_ACTUAL_POWER_STATE, 0): case SDW_SDCA_CTL(FUNC_NUM_AMP, RT721_SDCA_ENT0, RT721_SDCA_CTL_FUNC_STATUS, 0): return true; @@ -595,3 +611,4 @@ module_sdw_driver(rt721_sdca_sdw_driver); MODULE_DESCRIPTION("ASoC RT721 SDCA SDW driver"); MODULE_AUTHOR("Jack Yu "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("SND_SOC_SDCA"); diff --git a/sound/soc/codecs/rt721-sdca.c b/sound/soc/codecs/rt721-sdca.c index 9f567caecb70a..db4bf367011ec 100644 --- a/sound/soc/codecs/rt721-sdca.c +++ b/sound/soc/codecs/rt721-sdca.c @@ -21,6 +21,9 @@ #include #include #include +#include +#include +#include #include #include @@ -1482,6 +1485,32 @@ static int rt721_sdca_fu36_event(struct snd_soc_dapm_widget *w, return 0; } +/* The DisCo tables give the jack function PDEs up to 500 ms for PS3 to PS0 */ +static const struct sdca_pde_delay rt721_jack_pde_delays[] = { + { .from_ps = SDCA_PDE_PS3, .to_ps = SDCA_PDE_PS0, .us = 500000 }, +}; + +/* REQUESTED_PS only starts the transition, so wait for ACTUAL_PS to reach PS0 */ +static void rt721_sdca_pde_wait_ps0(struct rt721_sdca_priv *rt721, + unsigned char func, unsigned char entity) +{ + const struct sdca_pde_delay *delays = NULL; + int num_delays = 0; + int ret; + + if (func == FUNC_NUM_JACK_CODEC) { + delays = rt721_jack_pde_delays; + num_delays = ARRAY_SIZE(rt721_jack_pde_delays); + } + + ret = sdca_asoc_pde_poll_actual_ps(rt721->regmap, func, entity, + SDCA_PDE_PS3, SDCA_PDE_PS0, + delays, num_delays); + if (ret) + dev_warn(&rt721->slave->dev, "PDE 0x%x did not reach PS0: %d\n", + entity, ret); +} + static int rt721_sdca_pde47_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -1495,6 +1524,7 @@ static int rt721_sdca_pde47_event(struct snd_soc_dapm_widget *w, regmap_write(rt721->regmap, SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE40, RT721_SDCA_CTL_REQ_POWER_STATE, 0), ps0); + rt721_sdca_pde_wait_ps0(rt721, FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE40); break; case SND_SOC_DAPM_PRE_PMD: regmap_write(rt721->regmap, @@ -1518,6 +1548,7 @@ static int rt721_sdca_pde41_event(struct snd_soc_dapm_widget *w, regmap_write(rt721->regmap, SDW_SDCA_CTL(FUNC_NUM_AMP, RT721_SDCA_ENT_PDE41, RT721_SDCA_CTL_REQ_POWER_STATE, 0), ps0); + rt721_sdca_pde_wait_ps0(rt721, FUNC_NUM_AMP, RT721_SDCA_ENT_PDE41); break; case SND_SOC_DAPM_PRE_PMD: regmap_write(rt721->regmap, @@ -1541,6 +1572,7 @@ static int rt721_sdca_pde11_event(struct snd_soc_dapm_widget *w, regmap_write(rt721->regmap, SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT721_SDCA_ENT_PDE2A, RT721_SDCA_CTL_REQ_POWER_STATE, 0), ps0); + rt721_sdca_pde_wait_ps0(rt721, FUNC_NUM_MIC_ARRAY, RT721_SDCA_ENT_PDE2A); break; case SND_SOC_DAPM_PRE_PMD: regmap_write(rt721->regmap, @@ -1564,6 +1596,7 @@ static int rt721_sdca_pde34_event(struct snd_soc_dapm_widget *w, regmap_write(rt721->regmap, SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE12, RT721_SDCA_CTL_REQ_POWER_STATE, 0), ps0); + rt721_sdca_pde_wait_ps0(rt721, FUNC_NUM_JACK_CODEC, RT721_SDCA_ENT_PDE12); break; case SND_SOC_DAPM_PRE_PMD: regmap_write(rt721->regmap, diff --git a/sound/soc/codecs/rt721-sdca.h b/sound/soc/codecs/rt721-sdca.h index cc3bce0ba5178..2ae68ce3fde28 100644 --- a/sound/soc/codecs/rt721-sdca.h +++ b/sound/soc/codecs/rt721-sdca.h @@ -260,6 +260,7 @@ struct rt721_sdca_dmic_kctrl_priv { #define RT721_SDCA_CTL_XUV 0x34 #define RT721_SDCA_CTL_FU_CH_GAIN 0x0b #define RT721_SDCA_CTL_FUNC_STATUS 0x10 +#define RT721_SDCA_CTL_ACTUAL_POWER_STATE 0x10 /* RT721 SDCA channel */ #define CH_L 0x01 -- 2.56.0