From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F35E3C5DBB for ; Tue, 23 Jun 2026 07:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782199055; cv=none; b=nG4f7yDGhGXTbmij5KOJ8pz7ODeLutZj4gET9N9B+wU0oU3+2XKFWoMW1ugR5Q6VFOqesyneVXACtgVroilyMs3kQom+FlRb6bAGFeo+omlc8V92aiUVJozvFIL7c2+K7TDLF/6e/Opg1eILnajFYxFsgU8Rcxt7mLVTaDxlug4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782199055; c=relaxed/simple; bh=iyY+y5TN9IyHjJokwttza0905vWxKzcVubpcRLTFUdE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=WdOCiQV2kDenprTHyo3naxQsqv0cqImAWNDkEF0GZ0aQ6aSeeGa/0F7vobZgdUpU56IFkzxI1qEkInNwhNLJ0qGruFK+jwgf2IneGJXlOPdTmzECq3dZGrUo4LuwaL4f8pzJQMKFI8/+X8J+vVlgA+nTwi7HVpAfyEMV6NpY8hQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=N7wv4HHc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FJ2DlP80; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="N7wv4HHc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FJ2DlP80" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65N6ckIn1628482 for ; Tue, 23 Jun 2026 07:17:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=ROJ6IfZLONlQgvg7ILGZbruv22ROJsbV5xS Xg8JtFPo=; b=N7wv4HHcvRLQQ1om1KpcDWI0k0uI3ku+G06CCvEcOSU07QcRgQI yp9o6xwOJZ3WBkwFYNBOTLtvgZWR7yRMXnzBE0TcQnAyjDnilp36ffdxR9bJj1FL ejJu//o/JDS3+VukAneClGKAD7iR1QDvNxVFjeBlT6zucv9s7gAj4AqEjJqFaX4o AChp3E8CLQ5KXO7vYvrZtDQ7+rbonn9vFW5i94OnWFRxTO1tovaK3eCqxJlDCAy2 z2LOe/7BRCiGO/cTjviGWjqLYJd6YWGG87dudm5m1fcbbH4RHiD+7O5NQyeLbvB0 kKywCRI35Y2h9dllDBQeQv/uILtJOkJYW2g== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yhv3rn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 23 Jun 2026 07:17:32 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2bf11699875so9510365ad.1 for ; Tue, 23 Jun 2026 00:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782199052; x=1782803852; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ROJ6IfZLONlQgvg7ILGZbruv22ROJsbV5xSXg8JtFPo=; b=FJ2DlP80ZCSLEca1Z9u6FwbBodWiFhVP0sVcxc7BVBlChSSE2yOGoBdvgLe9p4WpTN NkXi2CNHV5oRnUsYEm7tDZezM/AE4a0giHqLOXmm98SqcCndZzzwZnzFs/OgxqRluxig VWZZmhIFt2b4D8lpogAyftl40CtMbPS948n9VNewMFd3NaquchYc+bjr89Ly1YEZui5D LiNLcv4ExVNTpbmBtLsgM6vTd6UlCfq/vRcWR8UXurjvjZRDGxUxYmEY0dgr556XIVeq emeziCRocHN22j/6Vhgf7Q5YGGqQKf86EzmHDiO/GtZbWern8QAr1zaUmAXlsADKRqM3 vHbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782199052; x=1782803852; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ROJ6IfZLONlQgvg7ILGZbruv22ROJsbV5xSXg8JtFPo=; b=LSa8oxRACrm2AdJieT5iG2Tn73xdaV3b1zKgMd3yDESxH+dwBRKXw1DFeWTUZYQ87E 9W0pDq+xlG9GC8/D7ElZQaG4suFcuzFJ5fqhzPZU//6TRkW8WJNYOzLMdZLFbZULqxWK FaUKTLEQ5zGby8H4sAhi0LjPqK8nGzXuaKC7L+05edb6QBDvSK9G+Q3BN1Vq1bynOzuD UdfyjL0VriDWJ/lgwIX4vTWVvSBb28Pm8X41MmrVzXh6KguVI/RN+01Ku19lLyGVeY1q 2KVya6SmT+4HlIWNCevQwKcRXuT1l7PRzb3ylZrps7JVk38Vw9fOFXhfEOj7rvDTCJ9O 3QKg== X-Forwarded-Encrypted: i=1; AHgh+RqN7LA8AmGu2e3v/6tdSaxUEXTM1SpssPdUNXFGkvKj8jUWUcUlqoTGCIQkS+J+k8ZmAxzRh7t259fEZc4=@vger.kernel.org X-Gm-Message-State: AOJu0YxSxJEYyv0azYeQJsTCfU+ExJ/og/5xt9c1PSnA0RIc48SzjZMC nT4fHhA+EWJglUeEIDfDXHQV7TtSdzuOpfhnByl2AXjzzeDfeQOCOGnkA4E1SGMBnhMQK60JF1R 7d3BXqr/Y9MQ9G7oZV30EBSpDHIJpVWyZwgaPwNQhcl7aVdTQ9vnwqUicEyJHeXyTjLQ= X-Gm-Gg: AfdE7clmbx80sHPPioOovo1BVWrrg0o3Z89EuUlLuUQEoth6puBt7npvWlnwFQ/0tLV jb2AEVr3+73na5BmhbZDNfUmDmKOOSqJ+/NksTeDdaIF9qAdiDyl4WZ8XTQRztR1JagLH8ksz+8 makYK/KzsPuM+ZjG15Xj1IplB7e0XYg22ZPX9IAKsC5IKYUjGhjR+gGbJIUISed8wZzlBqDaZD4 iHG38EVB83gPpbAOLgAyuEBaO/oSFIb77Ic88123oZHXIphh3uQurw8SN8CK8d0ogjc54Np+CJA PSQ1e5dhPpPyn6ocbWj+4ccM9D8U49unj0BEF2rcl4vP9y/eA1WhrRyYnplD8yWNhiCei1kzkSE oDebpDo1jJyxhLcYe2tgePHuA4VKGxfXo3pesI7c= X-Received: by 2002:a17:903:41c7:b0:2bf:1845:baf5 with SMTP id d9443c01a7336-2c7c3eb9751mr22858965ad.12.1782199051906; Tue, 23 Jun 2026 00:17:31 -0700 (PDT) X-Received: by 2002:a17:903:41c7:b0:2bf:1845:baf5 with SMTP id d9443c01a7336-2c7c3eb9751mr22858665ad.12.1782199051402; Tue, 23 Jun 2026 00:17:31 -0700 (PDT) Received: from hu-nandam-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7437002aesm99673535ad.37.2026.06.23.00.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 00:17:31 -0700 (PDT) From: Ajay Kumar Nandam To: broonie@kernel.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, srini@kernel.org Cc: linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/3] ASoC: codecs: lpass-va-macro: Switch to PM clock framework for runtime PM Date: Tue, 23 Jun 2026 12:47:07 +0530 Message-Id: <20260623071708.2822269-3-ajay.nandam@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDA1NiBTYWx0ZWRfXxTCrhAoE/UpX O/uzAT/tjOJNoStvJoWDWE/2hoaPHPNKJhasKH6utvJrd1T1g9p7DpazBINVMX8ZCui7NNG0fIF hOpdw/1+NlQWwVPMpRVs9u1OrYtfyf8= X-Proofpoint-ORIG-GUID: KhiLzuINOlNiSFvYTm21BcwrlXQf-c79 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDA1NiBTYWx0ZWRfXz9d5C1Ga3nmH D9lYWx9Aqh6KXUhiPoj3z1lZoN2xouHsIe8RZR1lBUBtqAqUfl5Zu7lQ3uEzogJKHLiAwxqeuPd u45yROYSVTteXs8RTX9w5D8W8paEQK7N+hY+gzlH/KJVEoB86B8AqF3sZpgTcGILa82yx7AHAoi G5NiySdA5SmrgMS4BlhKaNeBju6Wv3LbcZYiNADJifNowYQVJu2rcubPhgq4V7PcqlRhntRAr3f aWM55HqbDRJio02nWdibszfb9SnkAulEzpnkgHroHGt24WJg049VjRnG1MXSEPK14m5uFUmSi1R nz/UP59J/VcyOyeq6z3/JxPFUCBDVdJ/jdlPqsFTTtUs3K4Su+FFHCNQ8MLONd1gaQNxZpk9NNA ckmaYZinhs7BjdS5u9Bv5neQHv0yKNFZgNff2/9BGW31C/rnBZ5MqBnfkcYmcRGRooamsuORNtr 791DQNlnO1f88TUQOtA== X-Proofpoint-GUID: KhiLzuINOlNiSFvYTm21BcwrlXQf-c79 X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a3a330c cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=tLfOVjUU_VM9_-uA5fIA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_02,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230056 Convert the LPASS VA macro codec driver to runtime PM clock management by using the PM clock framework. Replace manual macro/dcodec/mclk/npl clock handling with PM clock helpers and runtime PM callbacks, and keep runtime PM references around fsgen clock gating so PM-clock-managed clocks remain active while fsgen is enabled. Set autosuspend delay to 100 ms so PM-clock-managed votes are dropped soon after idle while still avoiding suspend/resume churn on short gaps. Add a PM_CLK dependency to SND_SOC_LPASS_VA_MACRO since this patch introduces PM clock APIs. Improve failure unwind paths: handle runtime PM put errors in probe/fsgen paths and restore regcache state correctly on resume failure. Signed-off-by: Ajay Kumar Nandam --- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/lpass-va-macro.c | 142 +++++++++++++++++------------- 2 files changed, 80 insertions(+), 63 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 458ea62ad983..72a973dab84d 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -2896,6 +2896,7 @@ config SND_SOC_LPASS_WSA_MACRO config SND_SOC_LPASS_VA_MACRO depends on COMMON_CLK + depends on PM_CLK select REGMAP_MMIO select SND_SOC_LPASS_MACRO_COMMON tristate "Qualcomm VA Macro in LPASS(Low Power Audio SubSystem)" diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 528d5b167ecf..6e822e47c863 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -1346,34 +1347,58 @@ static int fsgen_gate_enable(struct clk_hw *hw) { struct va_macro *va = to_va_macro(hw); struct regmap *regmap = va->regmap; - int ret; + int ret, rpm_ret; - if (va->has_swr_master) { - ret = clk_prepare_enable(va->mclk); - if (ret) - return ret; - } + ret = pm_runtime_resume_and_get(va->dev); + if (ret < 0) + return ret; ret = va_macro_mclk_enable(va, true); + if (ret) { + rpm_ret = pm_runtime_put_autosuspend(va->dev); + if (rpm_ret < 0) + dev_warn(va->dev, + "runtime PM put failed in fsgen enable unwind: %d\n", + rpm_ret); + return ret; + } if (va->has_swr_master) regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, CDC_VA_SWR_CLK_EN_MASK, CDC_VA_SWR_CLK_ENABLE); - return ret; + return 0; } static void fsgen_gate_disable(struct clk_hw *hw) { struct va_macro *va = to_va_macro(hw); struct regmap *regmap = va->regmap; + int ret; if (va->has_swr_master) regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, CDC_VA_SWR_CLK_EN_MASK, 0x0); va_macro_mclk_enable(va, false); - if (va->has_swr_master) - clk_disable_unprepare(va->mclk); + + ret = pm_runtime_put_autosuspend(va->dev); + if (ret < 0) + dev_warn(va->dev, "runtime PM put failed in fsgen disable: %d\n", ret); +} + +static int va_macro_setup_pm_clocks(struct device *dev) +{ + int ret; + + ret = devm_pm_clk_create(dev); + if (ret) + return ret; + + ret = of_pm_clk_add_clks(dev); + if (ret < 0) + return ret; + + return 0; } static int fsgen_gate_is_enabled(struct clk_hw *hw) @@ -1534,6 +1559,7 @@ static int va_macro_probe(struct platform_device *pdev) void __iomem *base; u32 sample_rate = 0; int ret; + int rpm_ret; va = devm_kzalloc(dev, sizeof(*va), GFP_KERNEL); if (!va) @@ -1601,22 +1627,20 @@ static int va_macro_probe(struct platform_device *pdev) clk_set_rate(va->npl, 2 * VA_MACRO_MCLK_FREQ); } - ret = clk_prepare_enable(va->macro); + ret = va_macro_setup_pm_clocks(dev); if (ret) goto err; - ret = clk_prepare_enable(va->dcodec); - if (ret) - goto err_dcodec; - - ret = clk_prepare_enable(va->mclk); + pm_runtime_set_autosuspend_delay(dev, 100); + pm_runtime_use_autosuspend(dev); + ret = devm_pm_runtime_enable(dev); if (ret) - goto err_mclk; + goto err; - if (va->has_npl_clk) { - ret = clk_prepare_enable(va->npl); - if (ret) - goto err_npl; + rpm_ret = pm_runtime_resume_and_get(dev); + if (rpm_ret < 0) { + ret = rpm_ret; + goto err; } /** @@ -1629,7 +1653,7 @@ static int va_macro_probe(struct platform_device *pdev) /* read version from register */ ret = va_macro_set_lpass_codec_version(va); if (ret) - goto err_clkout; + goto err_rpm_put; } if (va->has_swr_master) { @@ -1659,35 +1683,28 @@ static int va_macro_probe(struct platform_device *pdev) va_macro_dais, ARRAY_SIZE(va_macro_dais)); if (ret) - goto err_clkout; - - pm_runtime_set_autosuspend_delay(dev, 3000); - pm_runtime_use_autosuspend(dev); - pm_runtime_mark_last_busy(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); + goto err_rpm_put; ret = va_macro_register_fsgen_output(va); if (ret) - goto err_clkout; + goto err_rpm_put; va->fsgen = devm_clk_hw_get_clk(dev, &va->hw, "fsgen"); if (IS_ERR(va->fsgen)) { ret = PTR_ERR(va->fsgen); - goto err_clkout; + goto err_rpm_put; } + rpm_ret = pm_runtime_put_autosuspend(dev); + if (rpm_ret < 0) + dev_warn(dev, "runtime PM put failed after probe: %d\n", rpm_ret); + return 0; -err_clkout: - if (va->has_npl_clk) - clk_disable_unprepare(va->npl); -err_npl: - clk_disable_unprepare(va->mclk); -err_mclk: - clk_disable_unprepare(va->dcodec); -err_dcodec: - clk_disable_unprepare(va->macro); +err_rpm_put: + rpm_ret = pm_runtime_put_sync_suspend(dev); + if (rpm_ret < 0) + dev_warn(dev, "runtime PM sync suspend failed in probe unwind: %d\n", rpm_ret); err: lpass_macro_pds_exit(va->pds); @@ -1698,27 +1715,23 @@ static void va_macro_remove(struct platform_device *pdev) { struct va_macro *va = dev_get_drvdata(&pdev->dev); - if (va->has_npl_clk) - clk_disable_unprepare(va->npl); - - clk_disable_unprepare(va->mclk); - clk_disable_unprepare(va->dcodec); - clk_disable_unprepare(va->macro); - lpass_macro_pds_exit(va->pds); } static int va_macro_runtime_suspend(struct device *dev) { struct va_macro *va = dev_get_drvdata(dev); + int ret; regcache_cache_only(va->regmap, true); - regcache_mark_dirty(va->regmap); - if (va->has_npl_clk) - clk_disable_unprepare(va->npl); + ret = pm_clk_suspend(dev); + if (ret) { + regcache_cache_only(va->regmap, false); + return ret; + } - clk_disable_unprepare(va->mclk); + regcache_mark_dirty(va->regmap); return 0; } @@ -1726,25 +1739,28 @@ static int va_macro_runtime_suspend(struct device *dev) static int va_macro_runtime_resume(struct device *dev) { struct va_macro *va = dev_get_drvdata(dev); - int ret; + int ret, sret; - ret = clk_prepare_enable(va->mclk); + ret = pm_clk_resume(dev); if (ret) { - dev_err(va->dev, "unable to prepare mclk\n"); + regcache_cache_only(va->regmap, true); + regcache_mark_dirty(va->regmap); return ret; } - if (va->has_npl_clk) { - ret = clk_prepare_enable(va->npl); - if (ret) { - clk_disable_unprepare(va->mclk); - dev_err(va->dev, "unable to prepare npl\n"); - return ret; - } - } - regcache_cache_only(va->regmap, false); - regcache_sync(va->regmap); + + ret = regcache_sync(va->regmap); + if (ret) { + regcache_cache_only(va->regmap, true); + regcache_mark_dirty(va->regmap); + sret = pm_clk_suspend(dev); + if (sret) + dev_err(va->dev, + "failed to suspend clocks after regcache sync failure: %d\n", + sret); + return ret; + } return 0; } -- 2.34.1